diff --git a/lib/data_service.dart b/lib/data/data_service.dart
similarity index 95%
rename from lib/data_service.dart
rename to lib/data/data_service.dart
index c2bb877..b1fa1e4 100644
--- a/lib/data_service.dart
+++ b/lib/data/data_service.dart
@@ -1,7 +1,7 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:telemednet/telemed_user.dart';
+import 'package:telemednet/data/telemed_user.dart';
 
 class DataService {
   static final String profileCollectionName =
diff --git a/lib/telemed_user.dart b/lib/data/telemed_user.dart
similarity index 100%
rename from lib/telemed_user.dart
rename to lib/data/telemed_user.dart
diff --git a/lib/routes.dart b/lib/routes.dart
index 76d5b8c..84607a1 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -1,10 +1,10 @@
 // routes.dart
 import 'package:firebase_ui_auth/firebase_ui_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:telemednet/launch_screen.dart';
+import 'package:telemednet/screens/launch_screen.dart';
 import 'package:telemednet/route_names.dart';
-import 'package:telemednet/user_profile_screen.dart';
-import 'package:telemednet/user_screen.dart';
+import 'package:telemednet/screens/user_profile_screen.dart';
+import 'package:telemednet/screens/user_screen.dart';
 
 final Map<String, Widget Function(BuildContext)> routes = {
   '/': (context) => const LaunchScreen(),
diff --git a/lib/launch_screen.dart b/lib/screens/launch_screen.dart
similarity index 97%
rename from lib/launch_screen.dart
rename to lib/screens/launch_screen.dart
index ee8da96..d59c8e0 100644
--- a/lib/launch_screen.dart
+++ b/lib/screens/launch_screen.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:telemednet/data_service.dart';
-import 'package:telemednet/primary_button.dart';
+import 'package:telemednet/data/data_service.dart';
+import 'package:telemednet/widgets/primary_button.dart';
 import 'package:telemednet/route_names.dart';
 
 class LaunchScreen extends StatefulWidget {
diff --git a/lib/user_profile_screen.dart b/lib/screens/user_profile_screen.dart
similarity index 100%
rename from lib/user_profile_screen.dart
rename to lib/screens/user_profile_screen.dart
diff --git a/lib/user_screen.dart b/lib/screens/user_screen.dart
similarity index 100%
rename from lib/user_screen.dart
rename to lib/screens/user_screen.dart
diff --git a/lib/error_view.dart b/lib/widgets/error_view.dart
similarity index 100%
rename from lib/error_view.dart
rename to lib/widgets/error_view.dart
diff --git a/lib/primary_button.dart b/lib/widgets/primary_button.dart
similarity index 100%
rename from lib/primary_button.dart
rename to lib/widgets/primary_button.dart