diff --git a/packages/neon/lib/main.dart b/packages/neon/lib/main.dart
index 4207a6ef..0d1f930b 100644
--- a/packages/neon/lib/main.dart
+++ b/packages/neon/lib/main.dart
@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:neon/app.dart';
 import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/push_notifications.dart';
 import 'package:neon/src/neon.dart';
diff --git a/packages/neon/lib/app.dart b/packages/neon/lib/src/app.dart
similarity index 89%
rename from packages/neon/lib/app.dart
rename to packages/neon/lib/src/app.dart
index 4e2fcdca..2365d244 100644
--- a/packages/neon/lib/app.dart
+++ b/packages/neon/lib/src/app.dart
@@ -1,13 +1,4 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/blocs/accounts.dart';
-import 'package:neon/src/neon.dart';
-import 'package:nextcloud/nextcloud.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+part of 'neon.dart';
 
 class NeonApp extends StatefulWidget {
   const NeonApp({
diff --git a/packages/neon/lib/src/neon.dart b/packages/neon/lib/src/neon.dart
index 2874b998..9e2dfe23 100644
--- a/packages/neon/lib/src/neon.dart
+++ b/packages/neon/lib/src/neon.dart
@@ -13,6 +13,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_rx_bloc/flutter_rx_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:http/http.dart';
@@ -52,6 +53,7 @@ import 'package:webview_flutter/webview_flutter.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:xdg_directories/xdg_directories.dart' as xdg;
 
+part 'app.dart';
 part 'pages/home/home.dart';
 part 'pages/home/widgets/server_status.dart';
 part 'pages/login/login.dart';