diff --git a/fonts/AvenirNext/AvenirNextCyr-Bold.ttf b/fonts/AvenirNext/AvenirNextCyr-Bold.ttf
deleted file mode 100644
index a1f8804..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Bold.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-BoldItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-BoldItalic.ttf
deleted file mode 100644
index 28c959e..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-BoldItalic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Demi.ttf b/fonts/AvenirNext/AvenirNextCyr-Demi.ttf
deleted file mode 100644
index 35cadac..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Demi.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-DemiItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-DemiItalic.ttf
deleted file mode 100644
index 68e8c14..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-DemiItalic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Heavy.ttf b/fonts/AvenirNext/AvenirNextCyr-Heavy.ttf
deleted file mode 100644
index 23629b7..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Heavy.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-HeavyItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-HeavyItalic.ttf
deleted file mode 100644
index b79908d..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-HeavyItalic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Italic.ttf b/fonts/AvenirNext/AvenirNextCyr-Italic.ttf
deleted file mode 100644
index 4276a8f..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Italic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Light.ttf b/fonts/AvenirNext/AvenirNextCyr-Light.ttf
deleted file mode 100644
index d0151ee..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Light.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-LightItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-LightItalic.ttf
deleted file mode 100644
index dffd08f..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-LightItalic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Medium.ttf b/fonts/AvenirNext/AvenirNextCyr-Medium.ttf
deleted file mode 100644
index e801f06..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Medium.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-MediumItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-MediumItalic.ttf
deleted file mode 100644
index 9f9aa7b..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-MediumItalic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Regular.ttf b/fonts/AvenirNext/AvenirNextCyr-Regular.ttf
deleted file mode 100644
index 1753074..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Regular.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-Thin.ttf b/fonts/AvenirNext/AvenirNextCyr-Thin.ttf
deleted file mode 100644
index 528b1fa..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-Thin.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-ThinItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-ThinItalic.ttf
deleted file mode 100644
index c4092f4..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-ThinItalic.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-UltraLight.ttf b/fonts/AvenirNext/AvenirNextCyr-UltraLight.ttf
deleted file mode 100644
index c718b5a..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-UltraLight.ttf and /dev/null differ
diff --git a/fonts/AvenirNext/AvenirNextCyr-UltraLightIt.ttf b/fonts/AvenirNext/AvenirNextCyr-UltraLightIt.ttf
deleted file mode 100644
index 1200743..0000000
Binary files a/fonts/AvenirNext/AvenirNextCyr-UltraLightIt.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Black.ttf b/fonts/Poppins/Poppins-Black.ttf
deleted file mode 100644
index 71c0f99..0000000
Binary files a/fonts/Poppins/Poppins-Black.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-BlackItalic.ttf b/fonts/Poppins/Poppins-BlackItalic.ttf
deleted file mode 100644
index 7aeb58b..0000000
Binary files a/fonts/Poppins/Poppins-BlackItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Bold.ttf b/fonts/Poppins/Poppins-Bold.ttf
deleted file mode 100644
index 00559ee..0000000
Binary files a/fonts/Poppins/Poppins-Bold.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-BoldItalic.ttf b/fonts/Poppins/Poppins-BoldItalic.ttf
deleted file mode 100644
index e61e8e8..0000000
Binary files a/fonts/Poppins/Poppins-BoldItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-ExtraBold.ttf b/fonts/Poppins/Poppins-ExtraBold.ttf
deleted file mode 100644
index df70936..0000000
Binary files a/fonts/Poppins/Poppins-ExtraBold.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-ExtraBoldItalic.ttf b/fonts/Poppins/Poppins-ExtraBoldItalic.ttf
deleted file mode 100644
index 14d2b37..0000000
Binary files a/fonts/Poppins/Poppins-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-ExtraLight.ttf b/fonts/Poppins/Poppins-ExtraLight.ttf
deleted file mode 100644
index e76ec69..0000000
Binary files a/fonts/Poppins/Poppins-ExtraLight.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-ExtraLightItalic.ttf b/fonts/Poppins/Poppins-ExtraLightItalic.ttf
deleted file mode 100644
index 89513d9..0000000
Binary files a/fonts/Poppins/Poppins-ExtraLightItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Italic.ttf b/fonts/Poppins/Poppins-Italic.ttf
deleted file mode 100644
index 12b7b3c..0000000
Binary files a/fonts/Poppins/Poppins-Italic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Light.ttf b/fonts/Poppins/Poppins-Light.ttf
deleted file mode 100644
index bc36bcc..0000000
Binary files a/fonts/Poppins/Poppins-Light.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-LightItalic.ttf b/fonts/Poppins/Poppins-LightItalic.ttf
deleted file mode 100644
index 9e70be6..0000000
Binary files a/fonts/Poppins/Poppins-LightItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Medium.ttf b/fonts/Poppins/Poppins-Medium.ttf
deleted file mode 100644
index 6bcdcc2..0000000
Binary files a/fonts/Poppins/Poppins-Medium.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-MediumItalic.ttf b/fonts/Poppins/Poppins-MediumItalic.ttf
deleted file mode 100644
index be67410..0000000
Binary files a/fonts/Poppins/Poppins-MediumItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Regular.ttf b/fonts/Poppins/Poppins-Regular.ttf
deleted file mode 100644
index 9f0c71b..0000000
Binary files a/fonts/Poppins/Poppins-Regular.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-SemiBold.ttf b/fonts/Poppins/Poppins-SemiBold.ttf
deleted file mode 100644
index 74c726e..0000000
Binary files a/fonts/Poppins/Poppins-SemiBold.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-SemiBoldItalic.ttf b/fonts/Poppins/Poppins-SemiBoldItalic.ttf
deleted file mode 100644
index 3e6c942..0000000
Binary files a/fonts/Poppins/Poppins-SemiBoldItalic.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-Thin.ttf b/fonts/Poppins/Poppins-Thin.ttf
deleted file mode 100644
index 03e7366..0000000
Binary files a/fonts/Poppins/Poppins-Thin.ttf and /dev/null differ
diff --git a/fonts/Poppins/Poppins-ThinItalic.ttf b/fonts/Poppins/Poppins-ThinItalic.ttf
deleted file mode 100644
index e26db5d..0000000
Binary files a/fonts/Poppins/Poppins-ThinItalic.ttf and /dev/null differ
diff --git a/lib/app/app.dart b/lib/app/app.dart
new file mode 100644
index 0000000..575db33
--- /dev/null
+++ b/lib/app/app.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+import 'package:spotify_collab_app/app/router/router.dart';
+import 'package:spotify_collab_app/app/theme/theme.dart';
+
+class CollabifyApp extends StatelessWidget {
+  const CollabifyApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp.router(
+      title: 'Kalculate',
+      theme: darkTheme,
+      themeMode: ThemeMode.dark,
+      debugShowCheckedModeBanner: false,
+      routerConfig: router,
+    );
+  }
+}
+
+void main() {
+  runApp(const CollabifyApp());
+}
diff --git a/lib/app/router/router.dart b/lib/app/router/router.dart
new file mode 100644
index 0000000..e627f67
--- /dev/null
+++ b/lib/app/router/router.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:spotify_collab_app/view/screens/u_home_screen.dart';
+
+final router = GoRouter(
+  initialLocation: '/',
+  routes: <GoRoute>[
+    GoRoute(
+      path: '/',
+      pageBuilder: (context, state) => const MaterialPage(child: HomeScreen()),
+    ),
+  ],
+);
diff --git a/lib/theme/theme.dart b/lib/app/theme/theme.dart
similarity index 100%
rename from lib/theme/theme.dart
rename to lib/app/theme/theme.dart
diff --git a/lib/main.dart b/lib/main.dart
index 525e7f9..c33a45f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,22 +1,6 @@
+import 'package:spotify_collab_app/app/app.dart';
 import 'package:flutter/material.dart';
-import 'package:spotify_collab_app/screens/home_screen.dart';
-import 'package:spotify_collab_app/screens/login_screen.dart';
-import 'theme/theme.dart';
 
 void main() {
-  runApp(const MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      debugShowCheckedModeBanner: false,
-      title: 'Spotify Collab',
-      theme: darkTheme,
-      home: const HomeScreen(),
-    );
-  }
+  runApp(const CollabifyApp());
 }
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
deleted file mode 100644
index 86feae6..0000000
--- a/lib/screens/home_screen.dart
+++ /dev/null
@@ -1,184 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:spotify_collab_app/widgets/now_playing.dart';
-import 'package:spotify_collab_app/widgets/recent_card.dart';
-import 'package:spotify_collab_app/widgets/song_widget.dart';
-
-class HomeScreen extends StatelessWidget {
-  const HomeScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-        appBar: AppBar(
-          centerTitle: true,
-          title: Padding(
-            padding: const EdgeInsets.only(right: 64),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                SvgPicture.asset('assets/logo.svg'),
-                const SizedBox(width: 10),
-                const Text(
-                  'Collabify',
-                  style: TextStyle(
-                    color: Colors.white,
-                    fontSize: 26,
-                    fontFamily: 'Avenir Next',
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        drawer: Drawer(
-          backgroundColor: const Color.fromARGB(255, 0, 0, 0),
-          child: ListView(
-            padding: EdgeInsets.zero,
-            children: <Widget>[
-              Container(
-                height: 100,
-                color: Colors.transparent,
-                child: const SizedBox(),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
-                child: ListTile(
-                  leading: const Icon(Icons.home_outlined, size: 36),
-                  title: const Center(
-                      child: Text('Home', style: TextStyle(fontSize: 28))),
-                  onTap: () {
-                    // Handle the tap
-                  },
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
-                child: ListTile(
-                  leading: const Icon(Icons.search_outlined, size: 36),
-                  title: const Center(
-                      child: Text('Search', style: TextStyle(fontSize: 28))),
-                  onTap: () {
-                    // Handle the tap
-                  },
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
-                child: ListTile(
-                  leading: const Icon(Icons.grid_view_outlined, size: 36),
-                  title: const Center(
-                      child:
-                          Text('Your Events', style: TextStyle(fontSize: 28))),
-                  onTap: () {
-                    // Handle the tap
-                  },
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
-                child: ListTile(
-                  leading: const Icon(Icons.account_circle_outlined, size: 36),
-                  title: const Center(
-                      child:
-                          Text('Your Profile', style: TextStyle(fontSize: 28))),
-                  onTap: () {
-                    // Handle the tap
-                  },
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
-                child: ListTile(
-                  leading: const Icon(Icons.settings_outlined, size: 36),
-                  title: const Center(
-                      child: Text('Settings', style: TextStyle(fontSize: 28))),
-                  onTap: () {
-                    // Handle the tap
-                  },
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
-                child: ListTile(
-                  leading: const Icon(Icons.queue_music_outlined, size: 36),
-                  title: const Center(
-                      child: Text('Your Playlists',
-                          style: TextStyle(fontSize: 28))),
-                  onTap: () {
-                    // Handle the tap
-                  },
-                ),
-              ),
-            ],
-          ),
-        ),
-        body: Container(
-          decoration: const BoxDecoration(
-            gradient: LinearGradient(
-              begin: Alignment.topLeft,
-              end: Alignment(0.8, 1),
-              colors: <Color>[
-                Color(0xff000000),
-                Color(0xff051e0f),
-                Color(0xff083216),
-              ],
-              tileMode: TileMode.mirror,
-            ),
-          ),
-          child: const SafeArea(
-            child: Padding(
-              padding: EdgeInsets.only(top: 40, left: 15, right: 15),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    "Recent Playlists",
-                    style: TextStyle(fontSize: 28, fontWeight: FontWeight.w500),
-                  ),
-                  SizedBox(height: 20),
-                  SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    child: Row(children: [
-                      RecentCard(),
-                      SizedBox(width: 20),
-                      RecentCard(),
-                      SizedBox(width: 20),
-                      RecentCard(),
-                      SizedBox(width: 20),
-                      RecentCard(),
-                      SizedBox(width: 20),
-                      RecentCard(),
-                      SizedBox(width: 20),
-                      RecentCard(),
-                      SizedBox(width: 20),
-                    ]),
-                  ),
-                  SizedBox(height: 40),
-                  Text(
-                    "Your Favourites",
-                    style: TextStyle(fontSize: 28, fontWeight: FontWeight.w500),
-                  ),
-                  SizedBox(height: 10),
-                  Column(
-                    children: [
-                      SongWidget(),
-                      SizedBox(height: 20),
-                      SongWidget(),
-                      SizedBox(height: 20),
-                      SongWidget(),
-                      SizedBox(height: 20),
-                    ],
-                  ),
-                  Spacer(),
-                  NowPlaying(),
-                ],
-              ),
-            ),
-          ),
-        ));
-  }
-}
diff --git a/lib/view/screens/u_home_screen.dart b/lib/view/screens/u_home_screen.dart
new file mode 100644
index 0000000..846671f
--- /dev/null
+++ b/lib/view/screens/u_home_screen.dart
@@ -0,0 +1,188 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:spotify_collab_app/view/widgets/u_now_playing.dart';
+import 'package:spotify_collab_app/view/widgets/u_recent_card.dart';
+import 'package:spotify_collab_app/view/widgets/u_song_widget.dart';
+
+class HomeScreen extends StatelessWidget {
+  const HomeScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: true,
+        title: Padding(
+          padding: const EdgeInsets.only(right: 64),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SvgPicture.asset('assets/logo.svg'),
+              const SizedBox(width: 10),
+              const Text(
+                'Collabify',
+                style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 26,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+      drawer: Drawer(
+        backgroundColor: const Color.fromARGB(255, 0, 0, 0),
+        child: ListView(
+          padding: EdgeInsets.zero,
+          children: <Widget>[
+            Container(
+              height: 100,
+              color: Colors.transparent,
+              child: const SizedBox(),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: ListTile(
+                leading: const Icon(Icons.home_outlined, size: 36),
+                title: const Center(
+                    child: Text('Home', style: TextStyle(fontSize: 28))),
+                onTap: () {
+                  // Handle the tap
+                },
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: ListTile(
+                leading: const Icon(Icons.search_outlined, size: 36),
+                title: const Center(
+                    child: Text('Search', style: TextStyle(fontSize: 28))),
+                onTap: () {
+                  // Handle the tap
+                },
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: ListTile(
+                leading: const Icon(Icons.grid_view_outlined, size: 36),
+                title: const Center(
+                    child: Text('Your Events', style: TextStyle(fontSize: 28))),
+                onTap: () {
+                  // Handle the tap
+                },
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: ListTile(
+                leading: const Icon(Icons.account_circle_outlined, size: 36),
+                title: const Center(
+                    child:
+                        Text('Your Profile', style: TextStyle(fontSize: 28))),
+                onTap: () {
+                  // Handle the tap
+                },
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: ListTile(
+                leading: const Icon(Icons.settings_outlined, size: 36),
+                title: const Center(
+                    child: Text('Settings', style: TextStyle(fontSize: 28))),
+                onTap: () {
+                  // Handle the tap
+                },
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: ListTile(
+                leading: const Icon(Icons.queue_music_outlined, size: 36),
+                title: const Center(
+                    child:
+                        Text('Your Playlists', style: TextStyle(fontSize: 28))),
+                onTap: () {
+                  // Handle the tap
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+      body: Container(
+        decoration: const BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topLeft,
+            end: Alignment(0.8, 1),
+            colors: <Color>[
+              Color(0xff000000),
+              Color(0xff051e0f),
+              Color(0xff083216),
+            ],
+            tileMode: TileMode.mirror,
+          ),
+        ),
+        child: const SafeArea(
+          child: Padding(
+            padding: EdgeInsets.only(top: 40, left: 15, right: 15),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  "Recent Playlists",
+                  style: TextStyle(fontSize: 28, fontWeight: FontWeight.w500),
+                ),
+                SizedBox(height: 15),
+                SingleChildScrollView(
+                  scrollDirection: Axis.horizontal,
+                  child: Row(
+                    children: [
+                      RecentCard(),
+                      SizedBox(width: 20),
+                      RecentCard(),
+                      SizedBox(width: 20),
+                      RecentCard(),
+                      SizedBox(width: 20),
+                      RecentCard(),
+                      SizedBox(width: 20),
+                      RecentCard(),
+                    ],
+                  ),
+                ),
+                SizedBox(height: 40),
+                Text(
+                  "Your Favourites",
+                  style: TextStyle(fontSize: 28, fontWeight: FontWeight.w500),
+                ),
+                SizedBox(height: 15),
+                Expanded(
+                  child: SingleChildScrollView(
+                    child: Column(
+                      children: [
+                        SongWidget(),
+                        SizedBox(height: 20),
+                        SongWidget(),
+                        SizedBox(height: 20),
+                        SongWidget(),
+                        SizedBox(height: 20),
+                        SongWidget(),
+                        SizedBox(height: 20),
+                        SongWidget(),
+                        SizedBox(height: 20),
+                      ],
+                    ),
+                  ),
+                ),
+                NowPlaying(),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/login_screen.dart b/lib/view/screens/u_login_screen.dart
similarity index 95%
rename from lib/screens/login_screen.dart
rename to lib/view/screens/u_login_screen.dart
index 7a6186c..1fb3228 100644
--- a/lib/screens/login_screen.dart
+++ b/lib/view/screens/u_login_screen.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spotify_collab_app/widgets/custom_text_field.dart';
+import 'package:spotify_collab_app/view/widgets/u_custom_text_field.dart';
 
 class LoginScreen extends StatelessWidget {
   const LoginScreen({super.key});
@@ -20,7 +20,6 @@ class LoginScreen extends StatelessWidget {
           style: TextStyle(
             color: Colors.white,
             fontSize: 20,
-            fontFamily: 'Avenir Next',
             fontWeight: FontWeight.w600,
           ),
         ),
diff --git a/lib/widgets/custom_text_field.dart b/lib/view/widgets/u_custom_text_field.dart
similarity index 100%
rename from lib/widgets/custom_text_field.dart
rename to lib/view/widgets/u_custom_text_field.dart
diff --git a/lib/widgets/now_playing.dart b/lib/view/widgets/u_now_playing.dart
similarity index 100%
rename from lib/widgets/now_playing.dart
rename to lib/view/widgets/u_now_playing.dart
diff --git a/lib/widgets/recent_card.dart b/lib/view/widgets/u_recent_card.dart
similarity index 100%
rename from lib/widgets/recent_card.dart
rename to lib/view/widgets/u_recent_card.dart
diff --git a/lib/widgets/song_widget.dart b/lib/view/widgets/u_song_widget.dart
similarity index 100%
rename from lib/widgets/song_widget.dart
rename to lib/view/widgets/u_song_widget.dart
diff --git a/pubspec.lock b/pubspec.lock
index ed8756f..150ada7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -91,6 +91,19 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: "39dd52168d6c59984454183148dc3a5776960c61083adfc708cc79a7b3ce1ba8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.1"
   http:
     dependency: transitive
     description:
@@ -139,6 +152,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
   matcher:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 0ca56af..3541061 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,6 +35,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
   flutter_svg: ^2.0.10+1
+  go_router: ^14.2.1
 
 dev_dependencies:
   flutter_test:
@@ -72,97 +73,7 @@ flutter:
   # "family" key with the font family name, and a "fonts" key with a
   # list giving the asset and other descriptors for the font. For
   # example:
-  fonts:
-    - family: Avenir Next
-      fonts:
-        - asset: fonts/AvenirNext/AvenirNextCyr-Bold.ttf
-          weight: 700
-        - asset: fonts/AvenirNext/AvenirNextCyr-BoldItalic.ttf
-          weight: 700
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-Demi.ttf
-          weight: 600
-        - asset: fonts/AvenirNext/AvenirNextCyr-DemiItalic.ttf
-          weight: 600
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-Heavy.ttf
-          weight: 900
-        - asset: fonts/AvenirNext/AvenirNextCyr-HeavyItalic.ttf
-          weight: 900
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-Italic.ttf
-          weight: 400
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-Light.ttf
-          weight: 200
-        - asset: fonts/AvenirNext/AvenirNextCyr-LightItalic.ttf
-          weight: 200
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-Medium.ttf
-          weight: 500
-        - asset: fonts/AvenirNext/AvenirNextCyr-MediumItalic.ttf
-          weight: 500
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-Regular.ttf
-          weight: 400
-        - asset: fonts/AvenirNext/AvenirNextCyr-Thin.ttf
-          weight: 100
-        - asset: fonts/AvenirNext/AvenirNextCyr-ThinItalic.ttf
-          weight: 100
-          style: italic
-        - asset: fonts/AvenirNext/AvenirNextCyr-UltraLight.ttf
-          weight: 200
-        - asset: fonts/AvenirNext/AvenirNextCyr-UltraLightIt.ttf
-          weight: 200
-          style: italic
-
-    - family: Poppins
-      fonts:
-        - asset: fonts/Poppins/Poppins-Black.ttf
-          weight: 900
-        - asset: fonts/Poppins/Poppins-BlackItalic.ttf
-          weight: 900
-          style: italic
-        - asset: fonts/Poppins/Poppins-Bold.ttf
-          weight: 700
-        - asset: fonts/Poppins/Poppins-BoldItalic.ttf
-          weight: 700
-          style: italic
-        - asset: fonts/Poppins/Poppins-ExtraBold.ttf
-          weight: 800
-        - asset: fonts/Poppins/Poppins-ExtraBoldItalic.ttf
-          weight: 800
-          style: italic
-        - asset: fonts/Poppins/Poppins-ExtraLight.ttf
-          weight: 200
-        - asset: fonts/Poppins/Poppins-ExtraLightItalic.ttf
-          weight: 200
-          style: italic
-        - asset: fonts/Poppins/Poppins-Italic.ttf
-          weight: 400
-          style: italic
-        - asset: fonts/Poppins/Poppins-Light.ttf
-          weight: 300
-        - asset: fonts/Poppins/Poppins-LightItalic.ttf
-          weight: 300
-          style: italic
-        - asset: fonts/Poppins/Poppins-Medium.ttf
-          weight: 500
-        - asset: fonts/Poppins/Poppins-MediumItalic.ttf
-          weight: 500
-          style: italic
-        - asset: fonts/Poppins/Poppins-Regular.ttf
-          weight: 400
-        - asset: fonts/Poppins/Poppins-SemiBold.ttf
-          weight: 600
-        - asset: fonts/Poppins/Poppins-SemiBoldItalic.ttf
-          weight: 600
-          style: italic
-        - asset: fonts/Poppins/Poppins-Thin.ttf
-          weight: 100
-        - asset: fonts/Poppins/Poppins-ThinItalic.ttf
-          weight: 100
-          style: italic
+  # fonts:
 
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/test/widget_test.dart b/test/widget_test.dart
index a5a058e..9248e3b 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -7,13 +7,12 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-
-import 'package:spotify_collab_app/main.dart';
+import 'package:spotify_collab_app/app/app.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
+    await tester.pumpWidget(const CollabifyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);