diff --git a/friendica_archive_browser/lib/src/friendica/components/filter_control_component.dart b/friendica_archive_browser/lib/src/components/filter_control_component.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/filter_control_component.dart
rename to friendica_archive_browser/lib/src/components/filter_control_component.dart
diff --git a/friendica_archive_browser/lib/src/friendica/components/geo/geo_extensions.dart b/friendica_archive_browser/lib/src/components/geo/geo_extensions.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/geo/geo_extensions.dart
rename to friendica_archive_browser/lib/src/components/geo/geo_extensions.dart
diff --git a/friendica_archive_browser/lib/src/friendica/components/geo/map_bounds.dart b/friendica_archive_browser/lib/src/components/geo/map_bounds.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/geo/map_bounds.dart
rename to friendica_archive_browser/lib/src/components/geo/map_bounds.dart
diff --git a/friendica_archive_browser/lib/src/friendica/components/geo/marker_data.dart b/friendica_archive_browser/lib/src/components/geo/marker_data.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/geo/marker_data.dart
rename to friendica_archive_browser/lib/src/components/geo/marker_data.dart
diff --git a/friendica_archive_browser/lib/src/friendica/components/link_elements_component.dart b/friendica_archive_browser/lib/src/components/link_elements_component.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/link_elements_component.dart
rename to friendica_archive_browser/lib/src/components/link_elements_component.dart
diff --git a/friendica_archive_browser/lib/src/friendica/components/media_timeline_component.dart b/friendica_archive_browser/lib/src/components/media_timeline_component.dart
similarity index 96%
rename from friendica_archive_browser/lib/src/friendica/components/media_timeline_component.dart
rename to friendica_archive_browser/lib/src/components/media_timeline_component.dart
index d4b08e9..66c188b 100644
--- a/friendica_archive_browser/lib/src/friendica/components/media_timeline_component.dart
+++ b/friendica_archive_browser/lib/src/components/media_timeline_component.dart
@@ -1,7 +1,7 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:friendica_archive_browser/src/friendica/screens/media_slideshow_screen.dart';
+import 'package:friendica_archive_browser/src/screens/media_slideshow_screen.dart';
 import 'package:friendica_archive_browser/src/models/media_attachment.dart';
 import 'package:friendica_archive_browser/src/services/archive_service_provider.dart';
 import 'package:friendica_archive_browser/src/settings/settings_controller.dart';
diff --git a/friendica_archive_browser/lib/src/friendica/components/media_wrapper_component.dart b/friendica_archive_browser/lib/src/components/media_wrapper_component.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/media_wrapper_component.dart
rename to friendica_archive_browser/lib/src/components/media_wrapper_component.dart
diff --git a/friendica_archive_browser/lib/src/friendica/components/tree_entry_card.dart b/friendica_archive_browser/lib/src/components/tree_entry_card.dart
similarity index 100%
rename from friendica_archive_browser/lib/src/friendica/components/tree_entry_card.dart
rename to friendica_archive_browser/lib/src/components/tree_entry_card.dart
diff --git a/friendica_archive_browser/lib/src/home.dart b/friendica_archive_browser/lib/src/home.dart
index 4196779..cf5a2d3 100644
--- a/friendica_archive_browser/lib/src/home.dart
+++ b/friendica_archive_browser/lib/src/home.dart
@@ -3,8 +3,8 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:friendica_archive_browser/src/services/archive_service_provider.dart';
 
-import 'friendica/screens/entries_screen.dart';
-import 'friendica/screens/stats_screen.dart';
+import 'screens/entries_screen.dart';
+import 'screens/stats_screen.dart';
 import 'settings/settings_controller.dart';
 import 'settings/settings_view.dart';
 
diff --git a/friendica_archive_browser/lib/src/models/location_data.dart b/friendica_archive_browser/lib/src/models/location_data.dart
index 08eebe4..fd66249 100644
--- a/friendica_archive_browser/lib/src/models/location_data.dart
+++ b/friendica_archive_browser/lib/src/models/location_data.dart
@@ -1,7 +1,7 @@
 import 'dart:math';
 
 import 'package:flutter/widgets.dart';
-import 'package:friendica_archive_browser/src/friendica/components/link_elements_component.dart';
+import 'package:friendica_archive_browser/src/components/link_elements_component.dart';
 
 import 'model_utils.dart';
 
diff --git a/friendica_archive_browser/lib/src/friendica/screens/entries_screen.dart b/friendica_archive_browser/lib/src/screens/entries_screen.dart
similarity index 93%
rename from friendica_archive_browser/lib/src/friendica/screens/entries_screen.dart
rename to friendica_archive_browser/lib/src/screens/entries_screen.dart
index 24eeeb5..958ebbb 100644
--- a/friendica_archive_browser/lib/src/friendica/screens/entries_screen.dart
+++ b/friendica_archive_browser/lib/src/screens/entries_screen.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:friendica_archive_browser/src/friendica/components/filter_control_component.dart';
-import 'package:friendica_archive_browser/src/friendica/components/tree_entry_card.dart';
+import 'package:friendica_archive_browser/src/components/filter_control_component.dart';
+import 'package:friendica_archive_browser/src/components/tree_entry_card.dart';
 import 'package:friendica_archive_browser/src/models/entry_tree_item.dart';
 import 'package:friendica_archive_browser/src/models/model_utils.dart';
 import 'package:friendica_archive_browser/src/screens/error_screen.dart';
@@ -10,8 +10,8 @@ import 'package:logging/logging.dart';
 import 'package:provider/provider.dart';
 import 'package:result_monad/result_monad.dart';
 
-import '../../screens/loading_status_screen.dart';
-import '../../screens/standin_status_screen.dart';
+import 'loading_status_screen.dart';
+import 'standin_status_screen.dart';
 
 class EntriesScreen extends StatelessWidget {
   static final _logger = Logger('$EntriesScreen');
diff --git a/friendica_archive_browser/lib/src/friendica/screens/geospatial_screen.dart b/friendica_archive_browser/lib/src/screens/geospatial_screen.dart
similarity index 97%
rename from friendica_archive_browser/lib/src/friendica/screens/geospatial_screen.dart
rename to friendica_archive_browser/lib/src/screens/geospatial_screen.dart
index 5ac0ce1..8b998b2 100644
--- a/friendica_archive_browser/lib/src/friendica/screens/geospatial_screen.dart
+++ b/friendica_archive_browser/lib/src/screens/geospatial_screen.dart
@@ -2,10 +2,8 @@ import 'dart:math';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:friendica_archive_browser/src/friendica/components/geo/geo_extensions.dart';
-import 'package:friendica_archive_browser/src/friendica/components/geo/map_bounds.dart';
-import 'package:friendica_archive_browser/src/friendica/components/geo/marker_data.dart';
-import 'package:friendica_archive_browser/src/friendica/components/tree_entry_card.dart';
+import 'package:friendica_archive_browser/src/components/geo/geo_extensions.dart';
+import 'package:friendica_archive_browser/src/components/tree_entry_card.dart';
 import 'package:friendica_archive_browser/src/friendica/services/friendica_path_mapping_service.dart';
 import 'package:friendica_archive_browser/src/models/entry_tree_item.dart';
 import 'package:friendica_archive_browser/src/models/timeline_entry.dart';
@@ -25,6 +23,9 @@ import 'package:network_to_file_image/network_to_file_image.dart';
 import 'package:provider/provider.dart';
 import 'package:result_monad/result_monad.dart';
 
+import '../components/geo/map_bounds.dart';
+import '../components/geo/marker_data.dart';
+
 class GeospatialViewScreen extends StatelessWidget {
   static final _logger = Logger('$GeospatialViewScreen');
 
diff --git a/friendica_archive_browser/lib/src/friendica/screens/media_slideshow_screen.dart b/friendica_archive_browser/lib/src/screens/media_slideshow_screen.dart
similarity index 98%
rename from friendica_archive_browser/lib/src/friendica/screens/media_slideshow_screen.dart
rename to friendica_archive_browser/lib/src/screens/media_slideshow_screen.dart
index c50042a..a4c477f 100644
--- a/friendica_archive_browser/lib/src/friendica/screens/media_slideshow_screen.dart
+++ b/friendica_archive_browser/lib/src/screens/media_slideshow_screen.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:friendica_archive_browser/src/friendica/components/media_wrapper_component.dart';
+import 'package:friendica_archive_browser/src/components/media_wrapper_component.dart';
 import 'package:friendica_archive_browser/src/friendica/services/friendica_path_mapping_service.dart';
 import 'package:friendica_archive_browser/src/models/media_attachment.dart';
 import 'package:friendica_archive_browser/src/settings/settings_controller.dart';
diff --git a/friendica_archive_browser/lib/src/friendica/screens/stats_screen.dart b/friendica_archive_browser/lib/src/screens/stats_screen.dart
similarity index 98%
rename from friendica_archive_browser/lib/src/friendica/screens/stats_screen.dart
rename to friendica_archive_browser/lib/src/screens/stats_screen.dart
index bdb884c..4407ed1 100644
--- a/friendica_archive_browser/lib/src/friendica/screens/stats_screen.dart
+++ b/friendica_archive_browser/lib/src/screens/stats_screen.dart
@@ -3,7 +3,7 @@ import 'package:friendica_archive_browser/src/components/heatmap_widget.dart';
 import 'package:friendica_archive_browser/src/components/timechart_widget.dart';
 import 'package:friendica_archive_browser/src/components/top_interactactors_widget.dart';
 import 'package:friendica_archive_browser/src/components/word_frequency_widget.dart';
-import 'package:friendica_archive_browser/src/friendica/components/filter_control_component.dart';
+import 'package:friendica_archive_browser/src/components/filter_control_component.dart';
 import 'package:friendica_archive_browser/src/models/model_utils.dart';
 import 'package:friendica_archive_browser/src/models/time_element.dart';
 import 'package:friendica_archive_browser/src/screens/standin_status_screen.dart';