diff --git a/lib/main.dart b/lib/main.dart
index f9d2d90..d551203 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:sendtrain/database/database.dart';
 import 'package:sendtrain/models/activity_timer_model.dart';
-import 'package:sendtrain/screens/activities_screen.dart';
+import 'package:sendtrain/widgets/screens/activities_screen.dart';
 import 'package:sendtrain/screens/sessions_screen.dart';
 // ignore: unused_import
 import 'package:sendtrain/database/seed.dart';
diff --git a/lib/widgets/activities/activity_view_media.dart b/lib/widgets/activities/activity_view_media.dart
index 1d6fcad..9ac92fc 100644
--- a/lib/widgets/activities/activity_view_media.dart
+++ b/lib/widgets/activities/activity_view_media.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:sendtrain/daos/media_items_dao.dart';
 import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/widgets/media_card.dart';
+import 'package:sendtrain/widgets/media/media_card.dart';
 
 class ActivityViewMedia extends StatelessWidget {
   const ActivityViewMedia({super.key, required this.activity});
diff --git a/lib/widgets/screens/activities_screen.dart b/lib/widgets/screens/activities_screen.dart
index 3a616d9..a9d0373 100644
--- a/lib/widgets/screens/activities_screen.dart
+++ b/lib/widgets/screens/activities_screen.dart
@@ -3,8 +3,8 @@ import 'package:sendtrain/classes/activity_action.dart';
 import 'package:sendtrain/database/database.dart' hide ActivityAction;
 import 'package:sendtrain/models/activity_model.dart';
 
-import '../widgets/activities/activities_header.dart';
-import '../widgets/activities/activity_card.dart';
+// import '../widgets/activities/activities_header.dart';
+// import '../widgets/activities/activity_card.dart';
 
 class ActivitiesScreen extends StatefulWidget {
   const ActivitiesScreen({super.key});
diff --git a/lib/widgets/screens/sessions_screen.dart b/lib/widgets/screens/sessions_screen.dart
index 0692b41..65624f1 100644
--- a/lib/widgets/screens/sessions_screen.dart
+++ b/lib/widgets/screens/sessions_screen.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:sendtrain/daos/sessions_dao.dart';
 import 'package:sendtrain/database/database.dart';
-import '../widgets/sessions/session_card.dart';
+import 'package:sendtrain/widgets/sessions/session_card.dart';
 import 'package:collection/collection.dart';
 
 class SessionsScreen extends StatefulWidget {
diff --git a/lib/widgets/sessions/session_view_media.dart b/lib/widgets/sessions/session_view_media.dart
index 8e614ad..6234cc8 100644
--- a/lib/widgets/sessions/session_view_media.dart
+++ b/lib/widgets/sessions/session_view_media.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:sendtrain/daos/media_items_dao.dart';
 import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/widgets/media_card.dart';
+import 'package:sendtrain/widgets/media/media_card.dart';
 
 class SessionViewMedia extends StatelessWidget {
   const SessionViewMedia({super.key, required this.session});