diff --git a/app/lib/pages/consts.dart b/app/lib/consts.dart
similarity index 100%
rename from app/lib/pages/consts.dart
rename to app/lib/consts.dart
diff --git a/app/lib/pages/server_requests/data_classes.dart b/app/lib/data_classes.dart
similarity index 100%
rename from app/lib/pages/server_requests/data_classes.dart
rename to app/lib/data_classes.dart
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index a0a5b7177a3cab6b248916d99e075c8519ed766b..6e66746c33d89233ef7b13fd996d3c8a80d0c9fc 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'widgets/map_widget.dart';
-import 'server_requests/data_classes.dart';
-import 'consts.dart';
-import 'server_requests/fetch_markers.dart';
-import 'server_requests/fetch_relation.dart';
 import 'dart:typed_data';
 
+import '../consts.dart';
+import '../widgets/map_widget.dart';
+import '../data_classes.dart';
+import '../server_requests/fetch_markers.dart';
+import '../server_requests/fetch_relation.dart';
+
 class DefaultPage extends StatefulWidget {
   const DefaultPage({Key? key}) : super(key: key);
 
diff --git a/app/lib/pages/server_requests/fetch_markers.dart b/app/lib/server_requests/fetch_markers.dart
similarity index 97%
rename from app/lib/pages/server_requests/fetch_markers.dart
rename to app/lib/server_requests/fetch_markers.dart
index 2e0e967976808a900ac1997b55be0827023a264d..fb16d8ecae7a77590bc37f1cb070ed2bf4fa1a19 100644
--- a/app/lib/pages/server_requests/fetch_markers.dart
+++ b/app/lib/server_requests/fetch_markers.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import '../consts.dart';
-import 'data_classes.dart';
+import '../../consts.dart';
+import '../data_classes.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter/material.dart';
diff --git a/app/lib/pages/server_requests/fetch_relation.dart b/app/lib/server_requests/fetch_relation.dart
similarity index 98%
rename from app/lib/pages/server_requests/fetch_relation.dart
rename to app/lib/server_requests/fetch_relation.dart
index 2a4abf5df854289596065e04fe3457657fa887a4..999a0611510203980a554a249a0feb7fda788143 100644
--- a/app/lib/pages/server_requests/fetch_relation.dart
+++ b/app/lib/server_requests/fetch_relation.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'package:path_provider/path_provider.dart';
 
-import '../consts.dart';
+import '../../consts.dart';
 
 /// Fetch relation data from server
 Future<Uint8List> fetchRelation() async {
diff --git a/app/lib/pages/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart
similarity index 98%
rename from app/lib/pages/widgets/choropleth_map.dart
rename to app/lib/widgets/choropleth_map.dart
index c6371034c4421705b0610d20bffd723fca9a3354..f611a1dcedf22d732f8c675834bbc60e64a1783c 100644
--- a/app/lib/pages/widgets/choropleth_map.dart
+++ b/app/lib/widgets/choropleth_map.dart
@@ -1,5 +1,5 @@
 import 'dart:typed_data';
-import '../server_requests/data_classes.dart';
+import '../data_classes.dart';
 import 'package:flutter/material.dart';
 import 'package:syncfusion_flutter_maps/maps.dart';
 import 'dart:math';
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/widgets/map_widget.dart
similarity index 99%
rename from app/lib/pages/widgets/map_widget.dart
rename to app/lib/widgets/map_widget.dart
index 510d1c631cd6250ff27cfab6d22fce2f5f92d120..c509347d990fd6939940e42452eeba9c5050b1c8 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/widgets/map_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import '../server_requests/data_classes.dart';
-import '../consts.dart';
+import '../data_classes.dart';
+import '../../consts.dart';
 import 'quick_view_chart.dart';
 import 'stat_charts.dart';
 import 'sat_layer.dart';
diff --git a/app/lib/pages/widgets/osm_map.dart b/app/lib/widgets/osm_map.dart
similarity index 92%
rename from app/lib/pages/widgets/osm_map.dart
rename to app/lib/widgets/osm_map.dart
index 44aa3614943e45055986b9d9f8c6868b26963356..d78cd8cb675cecc486e078ef0fbd1e7f4246d753 100644
--- a/app/lib/pages/widgets/osm_map.dart
+++ b/app/lib/widgets/osm_map.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import '../server_requests/data_classes.dart';
-import '../consts.dart';
+import '../data_classes.dart';
+import '../../consts.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/app/lib/pages/widgets/quick_view_chart.dart b/app/lib/widgets/quick_view_chart.dart
similarity index 100%
rename from app/lib/pages/widgets/quick_view_chart.dart
rename to app/lib/widgets/quick_view_chart.dart
diff --git a/app/lib/pages/widgets/sat_layer.dart b/app/lib/widgets/sat_layer.dart
similarity index 93%
rename from app/lib/pages/widgets/sat_layer.dart
rename to app/lib/widgets/sat_layer.dart
index c3b65fafd88c15838b800fa0a37936110fbe8861..097440e9d9e856a39b7b59785f953979fcdd3342 100644
--- a/app/lib/pages/widgets/sat_layer.dart
+++ b/app/lib/widgets/sat_layer.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../server_requests/data_classes.dart';
+import '../data_classes.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/app/lib/pages/widgets/stat_charts.dart b/app/lib/widgets/stat_charts.dart
similarity index 100%
rename from app/lib/pages/widgets/stat_charts.dart
rename to app/lib/widgets/stat_charts.dart