diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 2882d84d..2c0674cb 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -37,48 +37,48 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "all; PKG: packages/dynamite; `dart analyze --fatal-infos .`"
+    name: "all; PKG: packages/app; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite;commands:analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/app;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/app
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          sdk: stable
+          channel: stable
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_dynamite_pub_upgrade
-        name: packages/dynamite; dart pub upgrade
-        run: dart pub upgrade
+      - id: packages_app_pub_upgrade
+        name: packages/app; flutter pub upgrade
+        run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/dynamite
-      - name: "packages/dynamite; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.packages_dynamite_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/dynamite
+        working-directory: packages/app
+      - name: "packages/app; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
+        if: "always() && steps.packages_app_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/app
     needs:
       - job_001
   job_003:
-    name: "all; PKG: packages/nextcloud; `dart analyze --fatal-infos .`"
+    name: "all; PKG: packages/dynamite; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud;commands:analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -89,124 +89,124 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_nextcloud_pub_upgrade
-        name: packages/nextcloud; dart pub upgrade
+      - id: packages_dynamite_pub_upgrade
+        name: packages/dynamite; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/nextcloud
-      - name: "packages/nextcloud; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.packages_nextcloud_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/nextcloud
+        working-directory: packages/dynamite
+      - name: "packages/dynamite; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
+        if: "always() && steps.packages_dynamite_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/dynamite
     needs:
       - job_001
   job_004:
-    name: "all; PKG: packages/sort_box; `dart analyze --fatal-infos .`"
+    name: "all; PKG: packages/file_icons; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/sort_box;commands:analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/sort_box
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          sdk: stable
+          channel: stable
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_sort_box_pub_upgrade
-        name: packages/sort_box; dart pub upgrade
-        run: dart pub upgrade
+      - id: packages_file_icons_pub_upgrade
+        name: packages/file_icons; flutter pub upgrade
+        run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/sort_box
-      - name: "packages/sort_box; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.packages_sort_box_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/sort_box
+        working-directory: packages/file_icons
+      - name: "packages/file_icons; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
+        if: "always() && steps.packages_file_icons_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/file_icons
     needs:
       - job_001
   job_005:
-    name: "all; PKG: packages/spec_templates; `dart analyze --fatal-infos .`"
+    name: "all; PKG: packages/neon/neon; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/spec_templates;commands:analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/spec_templates
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          sdk: stable
+          channel: stable
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_spec_templates_pub_upgrade
-        name: packages/spec_templates; dart pub upgrade
-        run: dart pub upgrade
+      - id: packages_neon_neon_pub_upgrade
+        name: packages/neon/neon; flutter pub upgrade
+        run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/spec_templates
-      - name: "packages/spec_templates; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.packages_spec_templates_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/spec_templates
+        working-directory: packages/neon/neon
+      - name: "packages/neon/neon; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
+        if: "always() && steps.packages_neon_neon_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon
     needs:
       - job_001
   job_006:
-    name: "all; PKG: packages/dynamite; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
+    name: "all; PKG: packages/neon/neon_files; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_files;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_files
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
         with:
-          sdk: stable
+          channel: stable
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_dynamite_pub_upgrade
-        name: packages/dynamite; dart pub upgrade
-        run: dart pub upgrade
+      - id: packages_neon_neon_files_pub_upgrade
+        name: packages/neon/neon_files; flutter pub upgrade
+        run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/dynamite
-      - name: "packages/dynamite; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        working-directory: packages/neon/neon_files
+      - name: "packages/neon/neon_files; dart format --output=none --set-exit-if-changed --line-length 120 ."
         run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
-        if: "always() && steps.packages_dynamite_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/dynamite
+        if: "always() && steps.packages_neon_neon_files_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_files
     needs:
       - job_001
   job_007:
-    name: "all; PKG: packages/file_icons; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
+    name: "all; PKG: packages/neon/neon_news; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_news;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_news
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -217,28 +217,28 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_file_icons_pub_upgrade
-        name: packages/file_icons; flutter pub upgrade
+      - id: packages_neon_neon_news_pub_upgrade
+        name: packages/neon/neon_news; flutter pub upgrade
         run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/file_icons
-      - name: "packages/file_icons; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        working-directory: packages/neon/neon_news
+      - name: "packages/neon/neon_news; dart format --output=none --set-exit-if-changed --line-length 120 ."
         run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
-        if: "always() && steps.packages_file_icons_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/file_icons
+        if: "always() && steps.packages_neon_neon_news_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_news
     needs:
       - job_001
   job_008:
-    name: "all; PKG: packages/neon; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
+    name: "all; PKG: packages/neon/neon_notes; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notes;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notes
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -249,18 +249,50 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_neon_pub_upgrade
-        name: packages/neon; flutter pub upgrade
+      - id: packages_neon_neon_notes_pub_upgrade
+        name: packages/neon/neon_notes; flutter pub upgrade
         run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/neon
-      - name: "packages/neon; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        working-directory: packages/neon/neon_notes
+      - name: "packages/neon/neon_notes; dart format --output=none --set-exit-if-changed --line-length 120 ."
         run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
-        if: "always() && steps.packages_neon_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/neon
+        if: "always() && steps.packages_neon_neon_notes_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_notes
     needs:
       - job_001
   job_009:
+    name: "all; PKG: packages/neon/neon_notifications; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notifications;commands:format"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notifications
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
+        with:
+          channel: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_neon_neon_notifications_pub_upgrade
+        name: packages/neon/neon_notifications; flutter pub upgrade
+        run: flutter pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/neon/neon_notifications
+      - name: "packages/neon/neon_notifications; dart format --output=none --set-exit-if-changed --line-length 120 ."
+        run: "dart format --output=none --set-exit-if-changed --line-length 120 ."
+        if: "always() && steps.packages_neon_neon_notifications_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_notifications
+    needs:
+      - job_001
+  job_010:
     name: "all; PKG: packages/nextcloud; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -292,7 +324,7 @@ jobs:
         working-directory: packages/nextcloud
     needs:
       - job_001
-  job_010:
+  job_011:
     name: "all; PKG: packages/settings; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -324,7 +356,7 @@ jobs:
         working-directory: packages/settings
     needs:
       - job_001
-  job_011:
+  job_012:
     name: "all; PKG: packages/sort_box; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -356,7 +388,7 @@ jobs:
         working-directory: packages/sort_box
     needs:
       - job_001
-  job_012:
+  job_013:
     name: "all; PKG: packages/spec_templates; `dart format --output=none --set-exit-if-changed --line-length 120 .`"
     runs-on: ubuntu-latest
     steps:
@@ -388,7 +420,39 @@ jobs:
         working-directory: packages/spec_templates
     needs:
       - job_001
-  job_013:
+  job_014:
+    name: "all; PKG: packages/app; `flutter analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/app;commands:analyze_0"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/app
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
+        with:
+          channel: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_app_pub_upgrade
+        name: packages/app; flutter pub upgrade
+        run: flutter pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/app
+      - name: "packages/app; flutter analyze --fatal-infos ."
+        run: flutter analyze --fatal-infos .
+        if: "always() && steps.packages_app_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/app
+    needs:
+      - job_001
+  job_015:
     name: "all; PKG: packages/file_icons; `flutter analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -396,7 +460,7 @@ jobs:
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons;commands:analyze_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons;commands:analyze_0"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/file_icons
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
@@ -420,17 +484,17 @@ jobs:
         working-directory: packages/file_icons
     needs:
       - job_001
-  job_014:
-    name: "all; PKG: packages/neon; `flutter analyze --fatal-infos .`"
+  job_016:
+    name: "all; PKG: packages/neon/neon; `flutter analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon;commands:analyze_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon;commands:analyze_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -441,18 +505,146 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - id: packages_neon_pub_upgrade
-        name: packages/neon; flutter pub upgrade
+      - id: packages_neon_neon_pub_upgrade
+        name: packages/neon/neon; flutter pub upgrade
         run: flutter pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: packages/neon
-      - name: "packages/neon; flutter analyze --fatal-infos ."
+        working-directory: packages/neon/neon
+      - name: "packages/neon/neon; flutter analyze --fatal-infos ."
         run: flutter analyze --fatal-infos .
-        if: "always() && steps.packages_neon_pub_upgrade.conclusion == 'success'"
-        working-directory: packages/neon
+        if: "always() && steps.packages_neon_neon_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon
     needs:
       - job_001
-  job_015:
+  job_017:
+    name: "all; PKG: packages/neon/neon_files; `flutter analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_files;commands:analyze_0"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_files
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
+        with:
+          channel: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_neon_neon_files_pub_upgrade
+        name: packages/neon/neon_files; flutter pub upgrade
+        run: flutter pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/neon/neon_files
+      - name: "packages/neon/neon_files; flutter analyze --fatal-infos ."
+        run: flutter analyze --fatal-infos .
+        if: "always() && steps.packages_neon_neon_files_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_files
+    needs:
+      - job_001
+  job_018:
+    name: "all; PKG: packages/neon/neon_news; `flutter analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_news;commands:analyze_0"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_news
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
+        with:
+          channel: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_neon_neon_news_pub_upgrade
+        name: packages/neon/neon_news; flutter pub upgrade
+        run: flutter pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/neon/neon_news
+      - name: "packages/neon/neon_news; flutter analyze --fatal-infos ."
+        run: flutter analyze --fatal-infos .
+        if: "always() && steps.packages_neon_neon_news_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_news
+    needs:
+      - job_001
+  job_019:
+    name: "all; PKG: packages/neon/neon_notes; `flutter analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notes;commands:analyze_0"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notes
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
+        with:
+          channel: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_neon_neon_notes_pub_upgrade
+        name: packages/neon/neon_notes; flutter pub upgrade
+        run: flutter pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/neon/neon_notes
+      - name: "packages/neon/neon_notes; flutter analyze --fatal-infos ."
+        run: flutter analyze --fatal-infos .
+        if: "always() && steps.packages_neon_neon_notes_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_notes
+    needs:
+      - job_001
+  job_020:
+    name: "all; PKG: packages/neon/neon_notifications; `flutter analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notifications;commands:analyze_0"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/neon/neon_notifications
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d
+        with:
+          channel: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_neon_neon_notifications_pub_upgrade
+        name: packages/neon/neon_notifications; flutter pub upgrade
+        run: flutter pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/neon/neon_notifications
+      - name: "packages/neon/neon_notifications; flutter analyze --fatal-infos ."
+        run: flutter analyze --fatal-infos .
+        if: "always() && steps.packages_neon_neon_notifications_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/neon/neon_notifications
+    needs:
+      - job_001
+  job_021:
     name: "all; PKG: packages/settings; `flutter analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -460,7 +652,7 @@ jobs:
         uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/settings;commands:analyze_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/settings;commands:analyze_0"
           restore-keys: |
             os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/settings
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
@@ -484,7 +676,135 @@ jobs:
         working-directory: packages/settings
     needs:
       - job_001
-  job_016:
+  job_022:
+    name: "all; PKG: packages/dynamite; `dart analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite;commands:analyze_1"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/dynamite
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+        with:
+          sdk: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_dynamite_pub_upgrade
+        name: packages/dynamite; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/dynamite
+      - name: "packages/dynamite; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.packages_dynamite_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/dynamite
+    needs:
+      - job_001
+  job_023:
+    name: "all; PKG: packages/nextcloud; `dart analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud;commands:analyze_1"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/nextcloud
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+        with:
+          sdk: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_nextcloud_pub_upgrade
+        name: packages/nextcloud; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/nextcloud
+      - name: "packages/nextcloud; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.packages_nextcloud_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/nextcloud
+    needs:
+      - job_001
+  job_024:
+    name: "all; PKG: packages/sort_box; `dart analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/sort_box;commands:analyze_1"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/sort_box
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+        with:
+          sdk: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_sort_box_pub_upgrade
+        name: packages/sort_box; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/sort_box
+      - name: "packages/sort_box; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.packages_sort_box_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/sort_box
+    needs:
+      - job_001
+  job_025:
+    name: "all; PKG: packages/spec_templates; `dart analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/spec_templates;commands:analyze_1"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:packages/spec_templates
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46
+        with:
+          sdk: stable
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+      - id: packages_spec_templates_pub_upgrade
+        name: packages/spec_templates; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: packages/spec_templates
+      - name: "packages/spec_templates; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.packages_spec_templates_pub_upgrade.conclusion == 'success'"
+        working-directory: packages/spec_templates
+    needs:
+      - job_001
+  job_026:
     name: "all; PKG: packages/nextcloud; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -516,7 +836,7 @@ jobs:
         working-directory: packages/nextcloud
     needs:
       - job_001
-  job_017:
+  job_027:
     name: "all; PKG: packages/sort_box; `dart test`"
     runs-on: ubuntu-latest
     steps:
diff --git a/.idea/nextcloud-neon.iml b/.idea/nextcloud-neon.iml
index 375e1f39..c9ce2b9b 100644
--- a/.idea/nextcloud-neon.iml
+++ b/.idea/nextcloud-neon.iml
@@ -39,16 +39,49 @@
       <excludeFolder url="file://$MODULE_DIR$/.fvm/flutter_sdk/bin/cache/dart-sdk/lib/_internal/js_runtime/build" />
       <excludeFolder url="file://$MODULE_DIR$/.fvm" />
       <excludeFolder url="file://$MODULE_DIR$/packages/neon/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/neon/linux/flutter/ephemeral" />
       <excludeFolder url="file://$MODULE_DIR$/packages/neon/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/neon/build" />
-      <excludeFolder url="file://$MODULE_DIR$/packages/neon/android/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/packages/dynamite/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/dynamite/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/dynamite/build" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud_test/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud_test/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/packages/nextcloud_test/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_files/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_files/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_files/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_news/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_news/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_news/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_notes/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_notes/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_notes/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_notifications/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_notifications/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_notifications/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_widgets/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_widgets/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon_widgets/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/app/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/app/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/app/android/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/app/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/app/linux/flutter/ephemeral" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_files/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_files/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_files/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_news/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_news/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_news/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_notes/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_notes/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_notes/build" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_notifications/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_notifications/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/neon/neon_notifications/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -62,4 +95,4 @@
       </list>
     </option>
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Debug.xml b/.idea/runConfigurations/Debug.xml
index 539e14ae..e87fde39 100644
--- a/.idea/runConfigurations/Debug.xml
+++ b/.idea/runConfigurations/Debug.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Debug" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/packages/neon/lib/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/packages/app/lib/main.dart" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Release.xml b/.idea/runConfigurations/Release.xml
index 9fc9408b..ff7b811f 100644
--- a/.idea/runConfigurations/Release.xml
+++ b/.idea/runConfigurations/Release.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Release" type="FlutterRunConfigurationType" factoryName="Flutter">
     <option name="additionalArgs" value="--release" />
-    <option name="filePath" value="$PROJECT_DIR$/packages/neon/lib/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/packages/app/lib/main.dart" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/README.md b/README.md
index bad32166..2ef3849a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A beautiful convergent cross-platform client for Nextcloud written in Flutter.
 
-See [here](packages/neon/README.md) for screenshots and other material regarding the app.
+See [here](packages/app/README.md) for screenshots and other material regarding the app.
 
 This repository not only contains the Neon app, but also a Nextcloud client written in Dart.  
 The client will replace https://github.com/provokateurin/dart-nextcloud which is an older unmaintained client I wrote some time ago.  
diff --git a/packages/neon/.gitignore b/packages/app/.gitignore
similarity index 100%
rename from packages/neon/.gitignore
rename to packages/app/.gitignore
diff --git a/packages/neon/LICENSE b/packages/app/LICENSE
similarity index 100%
rename from packages/neon/LICENSE
rename to packages/app/LICENSE
diff --git a/packages/neon/README.md b/packages/app/README.md
similarity index 100%
rename from packages/neon/README.md
rename to packages/app/README.md
diff --git a/packages/app/analysis_options.yaml b/packages/app/analysis_options.yaml
new file mode 100644
index 00000000..c7c10b7d
--- /dev/null
+++ b/packages/app/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:nit_picking/flutter.yaml
diff --git a/packages/neon/android/.gitignore b/packages/app/android/.gitignore
similarity index 100%
rename from packages/neon/android/.gitignore
rename to packages/app/android/.gitignore
diff --git a/packages/neon/android/app/build.gradle b/packages/app/android/app/build.gradle
similarity index 100%
rename from packages/neon/android/app/build.gradle
rename to packages/app/android/app/build.gradle
diff --git a/packages/neon/android/app/src/debug/AndroidManifest.xml b/packages/app/android/app/src/debug/AndroidManifest.xml
similarity index 100%
rename from packages/neon/android/app/src/debug/AndroidManifest.xml
rename to packages/app/android/app/src/debug/AndroidManifest.xml
diff --git a/packages/neon/android/app/src/main/AndroidManifest.xml b/packages/app/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/neon/android/app/src/main/AndroidManifest.xml
rename to packages/app/android/app/src/main/AndroidManifest.xml
diff --git a/packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt b/packages/app/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt
similarity index 100%
rename from packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt
rename to packages/app/android/app/src/main/kotlin/de/provokateurin/neon/EmbeddedDistributor.kt
diff --git a/packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt b/packages/app/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt
similarity index 100%
rename from packages/neon/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt
rename to packages/app/android/app/src/main/kotlin/de/provokateurin/neon/MainActivity.kt
diff --git a/packages/app/android/app/src/main/res/drawable-hdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-hdpi/android12splash.png
new file mode 100644
index 00000000..7d9c1bc6
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-hdpi/splash.png b/packages/app/android/app/src/main/res/drawable-hdpi/splash.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-hdpi/splash.png
rename to packages/app/android/app/src/main/res/drawable-hdpi/splash.png
diff --git a/packages/app/android/app/src/main/res/drawable-mdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-mdpi/android12splash.png
new file mode 100644
index 00000000..d9c07180
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-mdpi/splash.png b/packages/app/android/app/src/main/res/drawable-mdpi/splash.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-mdpi/splash.png
rename to packages/app/android/app/src/main/res/drawable-mdpi/splash.png
diff --git a/packages/app/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-night-hdpi/android12splash.png
new file mode 100644
index 00000000..7d9c1bc6
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/packages/app/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-night-mdpi/android12splash.png
new file mode 100644
index 00000000..d9c07180
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night-v21/background.png b/packages/app/android/app/src/main/res/drawable-night-v21/background.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-night-v21/background.png
rename to packages/app/android/app/src/main/res/drawable-night-v21/background.png
diff --git a/packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml b/packages/app/android/app/src/main/res/drawable-night-v21/launch_background.xml
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml
rename to packages/app/android/app/src/main/res/drawable-night-v21/launch_background.xml
diff --git a/packages/app/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
new file mode 100644
index 00000000..24ac208b
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/packages/app/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
new file mode 100644
index 00000000..c08bc3df
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/packages/app/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
new file mode 100644
index 00000000..ee32fd4f
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night/background.png b/packages/app/android/app/src/main/res/drawable-night/background.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-night/background.png
rename to packages/app/android/app/src/main/res/drawable-night/background.png
diff --git a/packages/neon/android/app/src/main/res/drawable-night/launch_background.xml b/packages/app/android/app/src/main/res/drawable-night/launch_background.xml
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-night/launch_background.xml
rename to packages/app/android/app/src/main/res/drawable-night/launch_background.xml
diff --git a/packages/neon/android/app/src/main/res/drawable-v21/background.png b/packages/app/android/app/src/main/res/drawable-v21/background.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-v21/background.png
rename to packages/app/android/app/src/main/res/drawable-v21/background.png
diff --git a/packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/app/android/app/src/main/res/drawable-v21/launch_background.xml
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml
rename to packages/app/android/app/src/main/res/drawable-v21/launch_background.xml
diff --git a/packages/app/android/app/src/main/res/drawable-xhdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-xhdpi/android12splash.png
new file mode 100644
index 00000000..24ac208b
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-xhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-xhdpi/splash.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-xhdpi/splash.png
rename to packages/app/android/app/src/main/res/drawable-xhdpi/splash.png
diff --git a/packages/app/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-xxhdpi/android12splash.png
new file mode 100644
index 00000000..c08bc3df
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-xxhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-xxhdpi/splash.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-xxhdpi/splash.png
rename to packages/app/android/app/src/main/res/drawable-xxhdpi/splash.png
diff --git a/packages/app/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/packages/app/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
new file mode 100644
index 00000000..ee32fd4f
Binary files /dev/null and b/packages/app/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/packages/neon/android/app/src/main/res/drawable-xxxhdpi/splash.png b/packages/app/android/app/src/main/res/drawable-xxxhdpi/splash.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable-xxxhdpi/splash.png
rename to packages/app/android/app/src/main/res/drawable-xxxhdpi/splash.png
diff --git a/packages/neon/android/app/src/main/res/drawable/background.png b/packages/app/android/app/src/main/res/drawable/background.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable/background.png
rename to packages/app/android/app/src/main/res/drawable/background.png
diff --git a/packages/neon/android/app/src/main/res/drawable/launch_background.xml b/packages/app/android/app/src/main/res/drawable/launch_background.xml
similarity index 100%
rename from packages/neon/android/app/src/main/res/drawable/launch_background.xml
rename to packages/app/android/app/src/main/res/drawable/launch_background.xml
diff --git a/packages/neon/android/app/src/main/res/mipmap-hdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-hdpi/app_files.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-hdpi/app_files.png
rename to packages/app/android/app/src/main/res/mipmap-hdpi/app_files.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-hdpi/app_news.png b/packages/app/android/app/src/main/res/mipmap-hdpi/app_news.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-hdpi/app_news.png
rename to packages/app/android/app/src/main/res/mipmap-hdpi/app_news.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-hdpi/app_notes.png b/packages/app/android/app/src/main/res/mipmap-hdpi/app_notes.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-hdpi/app_notes.png
rename to packages/app/android/app/src/main/res/mipmap-hdpi/app_notes.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-hdpi/app_notifications.png b/packages/app/android/app/src/main/res/mipmap-hdpi/app_notifications.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-hdpi/app_notifications.png
rename to packages/app/android/app/src/main/res/mipmap-hdpi/app_notifications.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-mdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-mdpi/app_files.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-mdpi/app_files.png
rename to packages/app/android/app/src/main/res/mipmap-mdpi/app_files.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-mdpi/app_news.png b/packages/app/android/app/src/main/res/mipmap-mdpi/app_news.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-mdpi/app_news.png
rename to packages/app/android/app/src/main/res/mipmap-mdpi/app_news.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-mdpi/app_notes.png b/packages/app/android/app/src/main/res/mipmap-mdpi/app_notes.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-mdpi/app_notes.png
rename to packages/app/android/app/src/main/res/mipmap-mdpi/app_notes.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-mdpi/app_notifications.png b/packages/app/android/app/src/main/res/mipmap-mdpi/app_notifications.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-mdpi/app_notifications.png
rename to packages/app/android/app/src/main/res/mipmap-mdpi/app_notifications.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_files.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xhdpi/app_files.png
rename to packages/app/android/app/src/main/res/mipmap-xhdpi/app_files.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_news.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_news.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xhdpi/app_news.png
rename to packages/app/android/app/src/main/res/mipmap-xhdpi/app_news.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_notes.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_notes.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xhdpi/app_notes.png
rename to packages/app/android/app/src/main/res/mipmap-xhdpi/app_notes.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xhdpi/app_notifications.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/app_notifications.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xhdpi/app_notifications.png
rename to packages/app/android/app/src/main/res/mipmap-xhdpi/app_notifications.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_files.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_files.png
rename to packages/app/android/app/src/main/res/mipmap-xxhdpi/app_files.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_news.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_news.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_news.png
rename to packages/app/android/app/src/main/res/mipmap-xxhdpi/app_news.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_notes.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notes.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_notes.png
rename to packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notes.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png
rename to packages/app/android/app/src/main/res/mipmap-xxhdpi/app_notifications.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_files.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_files.png
rename to packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_files.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_news.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_news.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_news.png
rename to packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_news.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png
rename to packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notes.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png
rename to packages/app/android/app/src/main/res/mipmap-xxxhdpi/app_notifications.png
diff --git a/packages/neon/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/neon/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/packages/neon/android/app/src/main/res/raw/keep.xml b/packages/app/android/app/src/main/res/raw/keep.xml
similarity index 100%
rename from packages/neon/android/app/src/main/res/raw/keep.xml
rename to packages/app/android/app/src/main/res/raw/keep.xml
diff --git a/packages/neon/android/app/src/main/res/values-night-v31/styles.xml b/packages/app/android/app/src/main/res/values-night-v31/styles.xml
similarity index 94%
rename from packages/neon/android/app/src/main/res/values-night-v31/styles.xml
rename to packages/app/android/app/src/main/res/values-night-v31/styles.xml
index 9fbd016a..4ea7d6ac 100644
--- a/packages/neon/android/app/src/main/res/values-night-v31/styles.xml
+++ b/packages/app/android/app/src/main/res/values-night-v31/styles.xml
@@ -4,6 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground">#202020</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
diff --git a/packages/neon/android/app/src/main/res/values-night/styles.xml b/packages/app/android/app/src/main/res/values-night/styles.xml
similarity index 94%
rename from packages/neon/android/app/src/main/res/values-night/styles.xml
rename to packages/app/android/app/src/main/res/values-night/styles.xml
index 58ee4d9b..dbc9ea9f 100644
--- a/packages/neon/android/app/src/main/res/values-night/styles.xml
+++ b/packages/app/android/app/src/main/res/values-night/styles.xml
@@ -7,6 +7,7 @@
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/packages/neon/android/app/src/main/res/values-v31/styles.xml b/packages/app/android/app/src/main/res/values-v31/styles.xml
similarity index 94%
rename from packages/neon/android/app/src/main/res/values-v31/styles.xml
rename to packages/app/android/app/src/main/res/values-v31/styles.xml
index 2f799656..d6dcf137 100644
--- a/packages/neon/android/app/src/main/res/values-v31/styles.xml
+++ b/packages/app/android/app/src/main/res/values-v31/styles.xml
@@ -4,6 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground">#ffffff</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
diff --git a/packages/neon/android/app/src/main/res/values/styles.xml b/packages/app/android/app/src/main/res/values/styles.xml
similarity index 94%
rename from packages/neon/android/app/src/main/res/values/styles.xml
rename to packages/app/android/app/src/main/res/values/styles.xml
index 82c1a057..0d1fa8fc 100644
--- a/packages/neon/android/app/src/main/res/values/styles.xml
+++ b/packages/app/android/app/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/packages/neon/android/app/src/profile/AndroidManifest.xml b/packages/app/android/app/src/profile/AndroidManifest.xml
similarity index 100%
rename from packages/neon/android/app/src/profile/AndroidManifest.xml
rename to packages/app/android/app/src/profile/AndroidManifest.xml
diff --git a/packages/neon/android/build.gradle b/packages/app/android/build.gradle
similarity index 100%
rename from packages/neon/android/build.gradle
rename to packages/app/android/build.gradle
diff --git a/packages/neon/android/gradle.properties b/packages/app/android/gradle.properties
similarity index 100%
rename from packages/neon/android/gradle.properties
rename to packages/app/android/gradle.properties
diff --git a/packages/neon/android/gradle/wrapper/gradle-wrapper.properties b/packages/app/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/neon/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/app/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/neon/android/settings.gradle b/packages/app/android/settings.gradle
similarity index 100%
rename from packages/neon/android/settings.gradle
rename to packages/app/android/settings.gradle
diff --git a/packages/neon/flutter_native_splash.yaml b/packages/app/flutter_native_splash.yaml
similarity index 70%
rename from packages/neon/flutter_native_splash.yaml
rename to packages/app/flutter_native_splash.yaml
index 176f77b5..4f914af8 100644
--- a/packages/neon/flutter_native_splash.yaml
+++ b/packages/app/flutter_native_splash.yaml
@@ -1,9 +1,9 @@
 flutter_native_splash:
   color: "#ffffff"
   color_dark: "#202020"
-  image: assets/splash_icon.png
+  image: img/splash_icon.png
   android_12:
-    image: assets/splash_icon_android_12.png
+    image: img/splash_icon_android_12.png
     icon_background_color: "#ffffff"
     icon_background_color_dark: "#202020"
   ios: false
diff --git a/packages/app/img/splash_icon.png b/packages/app/img/splash_icon.png
new file mode 100644
index 00000000..49a22c01
Binary files /dev/null and b/packages/app/img/splash_icon.png differ
diff --git a/packages/app/img/splash_icon_android_12.png b/packages/app/img/splash_icon_android_12.png
new file mode 100644
index 00000000..476b6dd2
Binary files /dev/null and b/packages/app/img/splash_icon_android_12.png differ
diff --git a/packages/neon/integration_test/screenshot_test.dart b/packages/app/integration_test/screenshot_test.dart
similarity index 69%
rename from packages/neon/integration_test/screenshot_test.dart
rename to packages/app/integration_test/screenshot_test.dart
index fc1b4485..d7345ff5 100644
--- a/packages/neon/integration_test/screenshot_test.dart
+++ b/packages/app/integration_test/screenshot_test.dart
@@ -1,18 +1,13 @@
 import 'dart:io';
 
+import 'package:app/apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/apps/files/app.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/neon.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:provider/provider.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:settings/settings.dart';
+import 'package:neon/neon.dart';
+import 'package:neon_files/neon_files.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class MemorySharedPreferences implements SharedPreferences {
@@ -91,116 +86,18 @@ class MemorySharedPreferences implements SharedPreferences {
   }
 }
 
-Future pumpAppPage(
+Future runTestApp(
   final WidgetTester tester,
-  final IntegrationTestWidgetsFlutterBinding binding,
-  final PackageInfo packageInfo, {
-  required final Widget Function(BuildContext, Function(NextcloudTheme?)) builder,
+  final IntegrationTestWidgetsFlutterBinding binding, {
   final Account? account,
 }) async {
-  final sharedPreferences = MemorySharedPreferences();
-
-  final platform = await getNeonPlatform();
-  final requestManager = RequestManager();
-  final allAppImplementations = getAppImplementations(sharedPreferences, requestManager, platform);
-
-  final globalOptions = GlobalOptions(
-    AppStorage('global', sharedPreferences),
-    packageInfo,
-  );
-  await globalOptions.pushNotificationsEnabled.set(false);
-
-  final accountsBloc = AccountsBloc(
-    requestManager,
-    platform,
-    AppStorage('accounts', sharedPreferences),
-    sharedPreferences,
-    globalOptions,
-    allAppImplementations,
-  );
-  if (account != null) {
-    accountsBloc.addAccount(account);
-  }
-
-  final pushNotificationsBloc = PushNotificationsBloc(
-    accountsBloc,
-    sharedPreferences,
-    globalOptions,
-    platform,
-  );
-  final firstLaunchBloc = FirstLaunchBloc(
-    sharedPreferences,
-    disabled: true,
-  );
-  final nextPushBloc = NextPushBloc(
-    accountsBloc,
-    globalOptions,
-    disabled: true,
-  );
-
-  // ignore: close_sinks
-  final userThemeStream = BehaviorSubject<NextcloudTheme?>();
-
-  await tester.pumpWidget(
-    MultiProvider(
-      providers: [
-        Provider<SharedPreferences>(
-          create: (final _) => sharedPreferences,
-        ),
-        Provider<NeonPlatform>(
-          create: (final _) => platform,
-        ),
-        Provider<GlobalOptions>(
-          create: (final _) => globalOptions,
-        ),
-        Provider<RequestManager>(
-          create: (final _) => requestManager,
-        ),
-        Provider<AccountsBloc>(
-          create: (final _) => accountsBloc,
-        ),
-        Provider<PushNotificationsBloc>(
-          create: (final _) => pushNotificationsBloc,
-        ),
-        Provider<FirstLaunchBloc>(
-          create: (final _) => firstLaunchBloc,
-        ),
-        Provider<NextPushBloc>(
-          create: (final _) => nextPushBloc,
-        ),
-        Provider<List<AppImplementation>>(
-          create: (final _) => allAppImplementations,
-        ),
-        Provider<PackageInfo>(
-          create: (final _) => packageInfo,
-        ),
-      ],
-      child: StreamBuilder<NextcloudTheme?>(
-        stream: userThemeStream,
-        builder: (final context, final themeSnapshot) => OptionBuilder(
-          option: globalOptions.themeMode,
-          builder: (final context, final themeMode) => OptionBuilder(
-            option: globalOptions.themeOLEDAsDark,
-            builder: (final context, final themeOLEDAsDark) => OptionBuilder(
-              option: globalOptions.themeKeepOriginalAccentColor,
-              builder: (final context, final themeKeepOriginalAccentColor) => MaterialApp(
-                debugShowCheckedModeBanner: false,
-                localizationsDelegates: AppLocalizations.localizationsDelegates,
-                supportedLocales: AppLocalizations.supportedLocales,
-                theme: getThemeFromNextcloudTheme(
-                  themeSnapshot.data,
-                  themeMode ?? ThemeMode.system,
-                  Brightness.light,
-                  oledAsDark: themeOLEDAsDark ?? false,
-                  keepOriginalAccentColor: themeKeepOriginalAccentColor ?? true,
-                ),
-                home: builder(context, userThemeStream.add),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
+  await runNeon(
+    getAppImplementations: getAppImplementations,
+    binding: binding,
+    sharedPreferencesOverride: MemorySharedPreferences(),
+    account: account,
+    firstLaunchDisabled: true,
+    nextPushDisabled: true,
   );
   await tester.pumpAndSettle();
 }
@@ -227,27 +124,21 @@ Future main() async {
   assert(Platform.isAndroid, 'Screenshots need to be taken on Android');
 
   final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  late PackageInfo packageInfo;
-  late Account account;
+  final account = Account(
+    serverURL: 'http://10.0.2.2',
+    loginName: 'user1',
+    username: 'user1',
+    password: 'user1',
+  );
 
   setUpAll(() async {
-    packageInfo = await PackageInfo.fromPlatform();
-    account = Account(
-      serverURL: 'http://10.0.2.2',
-      loginName: 'user1',
-      username: 'user1',
-      password: 'user1',
-    );
-
     await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
   });
 
   testWidgets('login', (final tester) async {
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
-      builder: (final context, final _) => const LoginPage(),
     );
     await prepareScreenshot(tester, binding);
     await binding.takeScreenshot('login_server_selection');
@@ -262,15 +153,10 @@ Future main() async {
   });
 
   testWidgets('home', (final tester) async {
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
       account: account,
-      builder: (final context, final onThemeChanged) => HomePage(
-        account: account,
-        onThemeChanged: onThemeChanged,
-      ),
     );
     await openDrawer(tester);
     await tester.pumpAndSettle();
@@ -280,15 +166,10 @@ Future main() async {
   });
 
   testWidgets('files', (final tester) async {
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
       account: account,
-      builder: (final context, final onThemeChanged) => HomePage(
-        account: account,
-        onThemeChanged: onThemeChanged,
-      ),
     );
     await prepareScreenshot(tester, binding);
     await binding.takeScreenshot('files_root');
@@ -333,15 +214,10 @@ Future main() async {
       folderId: folder.folders.single.id,
     );
 
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
       account: account,
-      builder: (final context, final onThemeChanged) => HomePage(
-        account: account,
-        onThemeChanged: onThemeChanged,
-      ),
     );
     await prepareScreenshot(tester, binding);
     await switchPage(tester, 'app-news');
@@ -408,15 +284,10 @@ Future main() async {
       category: 'Financial',
     );
 
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
       account: account,
-      builder: (final context, final onThemeChanged) => HomePage(
-        account: account,
-        onThemeChanged: onThemeChanged,
-      ),
     );
     await prepareScreenshot(tester, binding);
     await switchPage(tester, 'app-notes');
@@ -481,15 +352,10 @@ Future main() async {
           longMessage: 'This is a notifications demo of the Neon app',
         );
 
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
       account: account,
-      builder: (final context, final onThemeChanged) => HomePage(
-        account: account,
-        onThemeChanged: onThemeChanged,
-      ),
     );
     await prepareScreenshot(tester, binding);
     await tester.tap(find.byKey(const Key('app-notifications')));
@@ -502,15 +368,10 @@ Future main() async {
   });
 
   testWidgets('settings', (final tester) async {
-    await pumpAppPage(
+    await runTestApp(
       tester,
       binding,
-      packageInfo,
       account: account,
-      builder: (final context, final onThemeChanged) => HomePage(
-        account: account,
-        onThemeChanged: onThemeChanged,
-      ),
     );
     await prepareScreenshot(tester, binding);
     await switchPage(tester, 'settings');
diff --git a/packages/app/lib/apps.dart b/packages/app/lib/apps.dart
new file mode 100644
index 00000000..59c00def
--- /dev/null
+++ b/packages/app/lib/apps.dart
@@ -0,0 +1,18 @@
+import 'package:neon/neon.dart';
+import 'package:neon_files/neon_files.dart';
+import 'package:neon_news/neon_news.dart';
+import 'package:neon_notes/neon_notes.dart';
+import 'package:neon_notifications/neon_notifications.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+List<AppImplementation> getAppImplementations(
+  final SharedPreferences sharedPreferences,
+  final RequestManager requestManager,
+  final NeonPlatform platform,
+) =>
+    [
+      FilesApp(sharedPreferences, requestManager, platform),
+      NewsApp(sharedPreferences, requestManager, platform),
+      NotesApp(sharedPreferences, requestManager, platform),
+      NotificationsApp(sharedPreferences, requestManager, platform),
+    ];
diff --git a/packages/app/lib/main.dart b/packages/app/lib/main.dart
new file mode 100644
index 00000000..3ae8a99c
--- /dev/null
+++ b/packages/app/lib/main.dart
@@ -0,0 +1,10 @@
+import 'package:app/apps.dart';
+import 'package:flutter/material.dart';
+import 'package:neon/neon.dart';
+
+Future main() async {
+  await runNeon(
+    getAppImplementations: getAppImplementations,
+    binding: WidgetsFlutterBinding.ensureInitialized(),
+  );
+}
diff --git a/packages/neon/linux/.gitignore b/packages/app/linux/.gitignore
similarity index 100%
rename from packages/neon/linux/.gitignore
rename to packages/app/linux/.gitignore
diff --git a/packages/neon/linux/CMakeLists.txt b/packages/app/linux/CMakeLists.txt
similarity index 100%
rename from packages/neon/linux/CMakeLists.txt
rename to packages/app/linux/CMakeLists.txt
diff --git a/packages/neon/linux/flutter/CMakeLists.txt b/packages/app/linux/flutter/CMakeLists.txt
similarity index 100%
rename from packages/neon/linux/flutter/CMakeLists.txt
rename to packages/app/linux/flutter/CMakeLists.txt
diff --git a/packages/neon/linux/flutter/generated_plugin_registrant.cc b/packages/app/linux/flutter/generated_plugin_registrant.cc
similarity index 100%
rename from packages/neon/linux/flutter/generated_plugin_registrant.cc
rename to packages/app/linux/flutter/generated_plugin_registrant.cc
diff --git a/packages/neon/linux/flutter/generated_plugin_registrant.h b/packages/app/linux/flutter/generated_plugin_registrant.h
similarity index 100%
rename from packages/neon/linux/flutter/generated_plugin_registrant.h
rename to packages/app/linux/flutter/generated_plugin_registrant.h
diff --git a/packages/neon/linux/flutter/generated_plugins.cmake b/packages/app/linux/flutter/generated_plugins.cmake
similarity index 100%
rename from packages/neon/linux/flutter/generated_plugins.cmake
rename to packages/app/linux/flutter/generated_plugins.cmake
diff --git a/packages/neon/linux/main.cc b/packages/app/linux/main.cc
similarity index 100%
rename from packages/neon/linux/main.cc
rename to packages/app/linux/main.cc
diff --git a/packages/neon/linux/my_application.cc b/packages/app/linux/my_application.cc
similarity index 100%
rename from packages/neon/linux/my_application.cc
rename to packages/app/linux/my_application.cc
diff --git a/packages/neon/linux/my_application.h b/packages/app/linux/my_application.h
similarity index 100%
rename from packages/neon/linux/my_application.h
rename to packages/app/linux/my_application.h
diff --git a/packages/neon/mono_pkg.yaml b/packages/app/mono_pkg.yaml
similarity index 100%
rename from packages/neon/mono_pkg.yaml
rename to packages/app/mono_pkg.yaml
diff --git a/packages/neon/pubspec.lock b/packages/app/pubspec.lock
similarity index 72%
rename from packages/neon/pubspec.lock
rename to packages/app/pubspec.lock
index 65af0f11..eef820a1 100644
--- a/packages/neon/pubspec.lock
+++ b/packages/app/pubspec.lock
@@ -1,22 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201"
-      url: "https://pub.dev"
-    source: hosted
-    version: "52.0.0"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.4.0"
   archive:
     dependency: transitive
     description:
@@ -29,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   asn1lib:
     dependency: transitive
     description:
@@ -57,70 +41,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
-  build:
-    dependency: transitive
-    description:
-      name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
-  build_config:
-    dependency: transitive
-    description:
-      name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  build_daemon:
-    dependency: transitive
-    description:
-      name: build_daemon
-      sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: "7c35a3a7868626257d8aee47b51c26b9dba11eaddf3431117ed2744951416aab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  build_runner:
-    dependency: "direct dev"
-    description:
-      name: build_runner
-      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.3"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.2.7"
-  built_collection:
-    dependency: transitive
-    description:
-      name: built_collection
-      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.1"
-  built_value:
-    dependency: transitive
-    description:
-      name: built_value
-      sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.4.3"
   characters:
     dependency: transitive
     description:
@@ -129,14 +49,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
   clock:
     dependency: transitive
     description:
@@ -145,16 +57,8 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
-  code_builder:
-    dependency: transitive
-    description:
-      name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.4.0"
   collection:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: collection
       sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
@@ -181,12 +85,12 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b
+      sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+2"
+    version: "0.3.3+4"
   crypto:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: crypto
       sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
@@ -209,14 +113,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.2"
-  dart_style:
-    dependency: transitive
-    description:
-      name: dart_style
-      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.4"
   dbus:
     dependency: transitive
     description:
@@ -250,14 +146,14 @@ packages:
     source: hosted
     version: "6.1.4"
   file_icons:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "../file_icons"
       relative: true
     source: path
     version: "1.0.0"
   file_picker:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: file_picker
       sha256: "704259669b5e9cb24e15c11cfcf02caf5f20d30901b3916d60b6d1c2d647035f"
@@ -265,28 +161,20 @@ packages:
     source: hosted
     version: "4.6.1"
   filesize:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: filesize
       sha256: f53df1f27ff60e466eefcd9df239e02d4722d5e2debee92a87dfd99ac66de2af
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
   flutter_cache_manager:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_cache_manager
       sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3"
@@ -299,7 +187,7 @@ packages:
     source: sdk
     version: "0.0.0"
   flutter_file_dialog:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_file_dialog
       sha256: fb19d8b7c811a70947344695001e82777921fdc0ed5c80289440f096ae22b10f
@@ -307,7 +195,7 @@ packages:
     source: hosted
     version: "2.3.2"
   flutter_html:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_html
       sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd"
@@ -315,7 +203,7 @@ packages:
     source: hosted
     version: "3.0.0-alpha.6"
   flutter_local_notifications:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_local_notifications
       sha256: f222919a34545931e47b06000836b5101baeffb0e6eb5a4691d2d42851740dd9
@@ -339,36 +227,36 @@ packages:
     source: hosted
     version: "6.0.0"
   flutter_localizations:
-    dependency: "direct main"
+    dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.0"
   flutter_markdown:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_markdown
-      sha256: "981442432b632237ffc1cf8092b4173b9e9f2278b5740637287c3069b51c8f09"
+      sha256: "7b25c10de1fea883f3c4f9b8389506b54053cd00807beab69fd65c8653a2711f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.13"
+    version: "0.6.14"
   flutter_native_splash:
     dependency: "direct main"
     description:
       name: flutter_native_splash
-      sha256: "048bd1f1dc0e5ea25899f702815934d9a9e916fe23451c320e7dd94d5e3ad933"
+      sha256: af665ef80a213a9ed502845a3d7a61b9acca4100ee7e9f067a7440bc3acd6730
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.19"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.9"
   flutter_svg:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_svg
       sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"
@@ -385,59 +273,27 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  graphs:
-    dependency: transitive
-    description:
-      name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
   html:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: html
-      sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269
+      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.1"
+    version: "0.15.2"
   http:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: http
       sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
       url: "https://pub.dev"
     source: hosted
     version: "0.13.5"
-  http_multi_server:
-    dependency: transitive
-    description:
-      name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -450,57 +306,57 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "1f9ecf99b08c92dedb699de1d28549f5d79b4423b48cf3f95d6968156db5dd67"
+      sha256: "483a389d6ccb292b570c31b3a193779b1b0178e7eb571986d9a49904b6861227"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.12"
+    version: "4.0.15"
   image_picker:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: image_picker
-      sha256: f98d76672d309c8b7030c323b3394669e122d52b307d2bbd8d06bd70f5b2aabe
+      sha256: cb25f04595a88450970dbe727243ba8cd21b6f7e0d7d1fc5b789fc6f52e95494
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.6+1"
+    version: "0.8.7+1"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: b1cbfec0f5aef427a18eb573f5445af8c9c568626bf3388553e40c263d3f7368
+      sha256: dfb5b0f28b8786fcc662b7ed42bfb4b82a6cbbd74da1958384b10d40bdf212a7
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.5+5"
+    version: "0.8.6+6"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "7d319fb74955ca46d9bf7011497860e3923bb67feebcf068f489311065863899"
+      sha256: "98f50d6b9f294c8ba35e25cc0d13b04bfddd25dbc8d32fa9d566a6572f2c081c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.10"
+    version: "2.1.12"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "39c013200046d14c58b71dc4fa3d00e425fc9c699d589136cd3ca018727c0493"
+      sha256: a1546ff5861fc15812953d4733b520c3d371cec3d2859a001ff04c46c4d81883
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.6+6"
+    version: "0.8.7+3"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "7cef2f28f4f2fef99180f636c3d446b4ccbafd6ba0fad2adc9a80c4040f656b8"
+      sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.2"
+    version: "2.6.3"
   integration_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
   intersperse:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: intersperse
       sha256: "2f8a905c96f6cbba978644a3d5b31b8d86ddc44917662df7d27a61f3df66a576"
@@ -508,21 +364,13 @@ packages:
     source: hosted
     version: "2.0.0"
   intl:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: intl
       sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
       url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
   js:
     dependency: transitive
     description:
@@ -532,37 +380,21 @@ packages:
     source: hosted
     version: "0.6.5"
   json_annotation:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: json_annotation
       sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
       url: "https://pub.dev"
     source: hosted
     version: "4.8.0"
-  json_serializable:
-    dependency: "direct dev"
-    description:
-      name: json_serializable
-      sha256: "040088d9eb2337f3a51ddabe35261e2fea1c351e3dd29d755ed1290b6b700a75"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.6.0"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c0bbfe94d46aedf9b8b3e695cf3bd48c8e14b35e3b2c639e0aa7755d589ba946
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
   markdown:
     dependency: transitive
     description:
       name: markdown
-      sha256: c2b81e184067b41d0264d514f7cdaa2c02d38511e39d6521a1ccc238f6d7b3f2
+      sha256: d95a9d12954aafc97f984ca29baaa7690ed4d9ec4140a23ad40580bcdb6c87f5
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.1"
+    version: "7.0.2"
   matcher:
     dependency: transitive
     description:
@@ -580,7 +412,7 @@ packages:
     source: hosted
     version: "0.2.0"
   material_design_icons_flutter:
-    dependency: "direct main"
+    dependency: "direct dev"
     description:
       name: material_design_icons_flutter
       sha256: "8ef8562d16e747b2d93e5da5c2508931588939c5c00ebc8e2768e803db7dfd3c"
@@ -611,6 +443,41 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  neon:
+    dependency: "direct main"
+    description:
+      path: "../neon/neon"
+      relative: true
+    source: path
+    version: "1.0.0"
+  neon_files:
+    dependency: "direct main"
+    description:
+      path: "../neon/neon_files"
+      relative: true
+    source: path
+    version: "1.0.0"
+  neon_news:
+    dependency: "direct main"
+    description:
+      path: "../neon/neon_news"
+      relative: true
+    source: path
+    version: "1.0.0"
+  neon_notes:
+    dependency: "direct main"
+    description:
+      path: "../neon/neon_notes"
+      relative: true
+    source: path
+    version: "1.0.0"
+  neon_notifications:
+    dependency: "direct main"
+    description:
+      path: "../neon/neon_notifications"
+      relative: true
+    source: path
+    version: "1.0.0"
   nested:
     dependency: transitive
     description:
@@ -620,7 +487,7 @@ packages:
     source: hosted
     version: "1.0.0"
   nextcloud:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "../nextcloud"
       relative: true
@@ -644,23 +511,15 @@ packages:
     source: hosted
     version: "2.0.0"
   open_file:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: open_file
       sha256: "5cd0288033d613ee7908aa974b7ff00805ae55d253f64d311603cf2e30613ca8"
       url: "https://pub.dev"
     source: hosted
     version: "3.2.1"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   package_info_plus:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: package_info_plus
       sha256: "7a6114becdf042be2b0777d77ace954d4a205644171a1cbd8712976b9bbb837c"
@@ -708,7 +567,7 @@ packages:
     source: hosted
     version: "1.0.5"
   path:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: path
       sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
@@ -732,45 +591,45 @@ packages:
     source: hosted
     version: "1.0.1"
   path_provider:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.14"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.0.24"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.10"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
@@ -788,7 +647,7 @@ packages:
     source: hosted
     version: "1.11.1"
   permission_handler:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: permission_handler
       sha256: "33c6a1253d1f95fd06fa74b65b7ba907ae9811f9d5c1d3150e51417d04b8d6a8"
@@ -807,10 +666,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "9c370ef6a18b1c4b2f7f35944d644a56aa23576f23abee654cf73968de93f163"
+      sha256: ee96ac32f5a8e6f80756e25b25b9f8e535816c8e6665a96b6d70681f8c4f7e85
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.7"
+    version: "9.0.8"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -847,26 +706,18 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.2"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: c3120a968135aead39699267f4c74bc9a08e4e909e86bc1b0af5bfd78691123c
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.1"
+    version: "3.7.2"
   process:
     dependency: transitive
     description:
@@ -876,31 +727,15 @@ packages:
     source: hosted
     version: "4.2.4"
   provider:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: provider
       sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
       url: "https://pub.dev"
     source: hosted
     version: "6.0.5"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  pubspec_parse:
-    dependency: transitive
-    description:
-      name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
   queue:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: queue
       sha256: "9a41ecadc15db79010108c06eae229a45c56b18db699760f34e8c9ac9b831ff9"
@@ -908,39 +743,39 @@ packages:
     source: hosted
     version: "3.1.0+2"
   quick_actions:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: quick_actions
-      sha256: "4c0a83915649901a07f45327467c3b567097269b2b248fb39ecdc1a564f3ccfb"
+      sha256: dd675e83197391bd0a67c92f97747ddbc610b374846816994057272388e92de7
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   quick_actions_android:
     dependency: transitive
     description:
       name: quick_actions_android
-      sha256: "053d3b45a43bf8fd45b22c2a39e49566e8fdc1adb72ce24c8aca7ac9f373fa70"
+      sha256: da0981160b59bf03ff912303d955e90545d6d12010149385127455e08c8b59b1
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   quick_actions_ios:
     dependency: transitive
     description:
       name: quick_actions_ios
-      sha256: "9d9e995029005a4188113394c8c9ac9a9aba30c8cc9a08bcb037d855f92677ba"
+      sha256: "20b9a3f41fc9ea7a7cad41abff2e79d2bce90555fc216e4e68d98fb260a2c776"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   quick_actions_platform_interface:
     dependency: transitive
     description:
       name: quick_actions_platform_interface
-      sha256: e7302e8487e3c0e6170843107d8eb142926b9eb19e927142c8b3dfa0dcca54ca
+      sha256: "2985e12b5fecb5715a35cc0a3b2127b4391e1969e62bd0a4a721b4de21d5fedb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   rxdart:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: rxdart
       sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
@@ -951,19 +786,19 @@ packages:
     dependency: transitive
     description:
       name: screen_retriever
-      sha256: "9c3839c4eb80807cd8210afa3c84a177ba00aef9f9b7b74ad92d3a0ab1d7e7ed"
+      sha256: "4931f226ca158123ccd765325e9fbf360bfed0af9b460a10f960f9bb13d58323"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.6"
   settings:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "../settings"
       relative: true
     source: path
     version: "1.0.0"
   share_plus:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: share_plus
       sha256: f582d5741930f3ad1bf0211d358eddc0508cc346e5b4b248bd1e569c995ebb7a
@@ -1014,74 +849,58 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9"
+      sha256: "858aaa72d8f61637d64e776aca82e1c67e6d9ee07979123c5d17115031c1b13b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.1.0"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7"
+      sha256: "8304d8a1f7d21a429f91dee552792249362b68a331ac5c3c1caf370f658873f6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.0"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "1ffa239043ab8baf881ec3094a3c767af9d10399b2839020b9e4d44c0bb23951"
+      sha256: cf2a42fb20148502022861f71698db12d937c7459345a1bdaa88fc91a91b3603
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.2.0"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874
+      sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3
+      sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958
+      sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3"
+    version: "2.2.0"
   shortid:
     dependency: transitive
     description:
@@ -1096,28 +915,12 @@ packages:
     source: sdk
     version: "0.0.99"
   sort_box:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "../sort_box"
       relative: true
     source: path
     version: "1.0.0"
-  source_gen:
-    dependency: transitive
-    description:
-      name: source_gen
-      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.6"
-  source_helper:
-    dependency: transitive
-    description:
-      name: source_helper
-      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -1127,37 +930,37 @@ packages:
     source: hosted
     version: "1.9.1"
   sqflite:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: sqflite
-      sha256: "067ab48dbc66bae05e18073a604443baa35957101bd3905b94f65e764c6d0688"
+      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.6"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: f09c65d08216b0688e357be88a82925c98c9920056e3db15c37f735f1b5d5f25
+      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   sqflite_common_ffi:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: sqflite_common_ffi
-      sha256: e435a9dcd0ca79ba6aea677468e6f7cb8859891294a8f34226685f2cf2002ea2
+      sha256: "79c719db08d3b779919da8679c4f1c2f5d8792b5ceb35a0eb872525ce2724cf8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1+1"
+    version: "2.2.2"
   sqlite3:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: db6350456720a4088a364bbe02052d43056a5ffbd4816fe9d28310dcfbe0dc05
+      sha256: "822d321a008e194d7929357e5b58d2e4a04ab670d137182f9759152aa33180ff"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.1"
   stack_trace:
     dependency: transitive
     description:
@@ -1174,14 +977,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
-  stream_transform:
-    dependency: transitive
-    description:
-      name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
@@ -1230,16 +1025,8 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.1"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   tray_manager:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: tray_manager
       sha256: b1975a05e0c6999e983cf9a58a6a098318c896040ccebac5398a3cc9e43b9c69
@@ -1255,7 +1042,7 @@ packages:
     source: hosted
     version: "1.3.1"
   unifiedpush:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: unifiedpush
       sha256: fa0f38104cacd258b750d400c1842fa71ac4bbf29b3c741944d2c6d4572d789e
@@ -1282,74 +1069,74 @@ packages:
     dependency: transitive
     description:
       name: universal_io
-      sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef"
+      sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.2.0"
   url_launcher:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: url_launcher
-      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
+      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.8"
+    version: "6.1.10"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1"
+      sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.23"
+    version: "6.0.26"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.18"
+    version: "6.1.4"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
+      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.4"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094"
+      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.4"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
+      sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
+      sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
+    version: "2.0.16"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
+      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   uuid:
     dependency: transitive
     description:
@@ -1383,7 +1170,7 @@ packages:
     source: hosted
     version: "9.4.0"
   wakelock:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: wakelock
       sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db"
@@ -1422,22 +1209,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
   webdriver:
     dependency: transitive
     description:
@@ -1447,7 +1218,7 @@ packages:
     source: hosted
     version: "3.0.1"
   webview_flutter:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: webview_flutter
       sha256: "392c1d83b70fe2495de3ea2c84531268d5b8de2de3f01086a53334d8b6030a88"
@@ -1487,7 +1258,7 @@ packages:
     source: hosted
     version: "2.6.1"
   window_manager:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: window_manager
       sha256: d812d3189d23465d2e94baa2505a4462b46dde4939012ff370711c6897d747ae
@@ -1495,7 +1266,7 @@ packages:
     source: hosted
     version: "0.2.9"
   xdg_directories:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: xdg_directories
       sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml
new file mode 100644
index 00000000..7c1340ef
--- /dev/null
+++ b/packages/app/pubspec.yaml
@@ -0,0 +1,37 @@
+name: app
+version: 1.0.0
+publish_to: 'none'
+
+environment:
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.9'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  flutter_native_splash: ^2.2.0+1
+  neon:
+    path: ../neon/neon
+  neon_files:
+    path: ../neon/neon_files
+  neon_news:
+    path: ../neon/neon_news
+  neon_notes:
+    path: ../neon/neon_notes
+  neon_notifications:
+    path: ../neon/neon_notifications
+  shared_preferences: ^2.1.0
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  integration_test:
+    sdk: flutter
+  material_design_icons_flutter: ^6.0.7096
+  nit_picking:
+    git:
+      url: https://github.com/stack11/dart_nit_picking
+      ref: 0b2ee0d
+
+flutter:
+  uses-material-design: true
diff --git a/packages/neon/screenshots/files_actions.png b/packages/app/screenshots/files_actions.png
similarity index 100%
rename from packages/neon/screenshots/files_actions.png
rename to packages/app/screenshots/files_actions.png
diff --git a/packages/neon/screenshots/files_create.png b/packages/app/screenshots/files_create.png
similarity index 100%
rename from packages/neon/screenshots/files_create.png
rename to packages/app/screenshots/files_create.png
diff --git a/packages/neon/screenshots/files_details.png b/packages/app/screenshots/files_details.png
similarity index 100%
rename from packages/neon/screenshots/files_details.png
rename to packages/app/screenshots/files_details.png
diff --git a/packages/neon/screenshots/files_photos.png b/packages/app/screenshots/files_photos.png
similarity index 100%
rename from packages/neon/screenshots/files_photos.png
rename to packages/app/screenshots/files_photos.png
diff --git a/packages/neon/screenshots/files_root.png b/packages/app/screenshots/files_root.png
similarity index 100%
rename from packages/neon/screenshots/files_root.png
rename to packages/app/screenshots/files_root.png
diff --git a/packages/neon/screenshots/home_drawer.png b/packages/app/screenshots/home_drawer.png
similarity index 100%
rename from packages/neon/screenshots/home_drawer.png
rename to packages/app/screenshots/home_drawer.png
diff --git a/packages/neon/screenshots/login_form.png b/packages/app/screenshots/login_form.png
similarity index 100%
rename from packages/neon/screenshots/login_form.png
rename to packages/app/screenshots/login_form.png
diff --git a/packages/neon/screenshots/login_server_selection.png b/packages/app/screenshots/login_server_selection.png
similarity index 100%
rename from packages/neon/screenshots/login_server_selection.png
rename to packages/app/screenshots/login_server_selection.png
diff --git a/packages/neon/screenshots/news_articles_starred_list.png b/packages/app/screenshots/news_articles_starred_list.png
similarity index 100%
rename from packages/neon/screenshots/news_articles_starred_list.png
rename to packages/app/screenshots/news_articles_starred_list.png
diff --git a/packages/neon/screenshots/news_articles_unread_list.png b/packages/app/screenshots/news_articles_unread_list.png
similarity index 100%
rename from packages/neon/screenshots/news_articles_unread_list.png
rename to packages/app/screenshots/news_articles_unread_list.png
diff --git a/packages/neon/screenshots/news_feed_add.png b/packages/app/screenshots/news_feed_add.png
similarity index 100%
rename from packages/neon/screenshots/news_feed_add.png
rename to packages/app/screenshots/news_feed_add.png
diff --git a/packages/neon/screenshots/news_feed_articles_list.png b/packages/app/screenshots/news_feed_articles_list.png
similarity index 100%
rename from packages/neon/screenshots/news_feed_articles_list.png
rename to packages/app/screenshots/news_feed_articles_list.png
diff --git a/packages/neon/screenshots/news_feeds_list.png b/packages/app/screenshots/news_feeds_list.png
similarity index 100%
rename from packages/neon/screenshots/news_feeds_list.png
rename to packages/app/screenshots/news_feeds_list.png
diff --git a/packages/neon/screenshots/news_folders_list.png b/packages/app/screenshots/news_folders_list.png
similarity index 100%
rename from packages/neon/screenshots/news_folders_list.png
rename to packages/app/screenshots/news_folders_list.png
diff --git a/packages/neon/screenshots/notes_categories_list.png b/packages/app/screenshots/notes_categories_list.png
similarity index 100%
rename from packages/neon/screenshots/notes_categories_list.png
rename to packages/app/screenshots/notes_categories_list.png
diff --git a/packages/neon/screenshots/notes_note_create.png b/packages/app/screenshots/notes_note_create.png
similarity index 100%
rename from packages/neon/screenshots/notes_note_create.png
rename to packages/app/screenshots/notes_note_create.png
diff --git a/packages/neon/screenshots/notes_note_edit.png b/packages/app/screenshots/notes_note_edit.png
similarity index 100%
rename from packages/neon/screenshots/notes_note_edit.png
rename to packages/app/screenshots/notes_note_edit.png
diff --git a/packages/neon/screenshots/notes_note_preview.png b/packages/app/screenshots/notes_note_preview.png
similarity index 100%
rename from packages/neon/screenshots/notes_note_preview.png
rename to packages/app/screenshots/notes_note_preview.png
diff --git a/packages/neon/screenshots/notes_notes_list.png b/packages/app/screenshots/notes_notes_list.png
similarity index 100%
rename from packages/neon/screenshots/notes_notes_list.png
rename to packages/app/screenshots/notes_notes_list.png
diff --git a/packages/neon/screenshots/notifications_list.png b/packages/app/screenshots/notifications_list.png
similarity index 100%
rename from packages/neon/screenshots/notifications_list.png
rename to packages/app/screenshots/notifications_list.png
diff --git a/packages/neon/screenshots/settings_account.png b/packages/app/screenshots/settings_account.png
similarity index 100%
rename from packages/neon/screenshots/settings_account.png
rename to packages/app/screenshots/settings_account.png
diff --git a/packages/neon/screenshots/settings_accounts.png b/packages/app/screenshots/settings_accounts.png
similarity index 100%
rename from packages/neon/screenshots/settings_accounts.png
rename to packages/app/screenshots/settings_accounts.png
diff --git a/packages/neon/screenshots/settings_app_files.png b/packages/app/screenshots/settings_app_files.png
similarity index 100%
rename from packages/neon/screenshots/settings_app_files.png
rename to packages/app/screenshots/settings_app_files.png
diff --git a/packages/neon/screenshots/settings_app_news.png b/packages/app/screenshots/settings_app_news.png
similarity index 100%
rename from packages/neon/screenshots/settings_app_news.png
rename to packages/app/screenshots/settings_app_news.png
diff --git a/packages/neon/screenshots/settings_app_notes.png b/packages/app/screenshots/settings_app_notes.png
similarity index 100%
rename from packages/neon/screenshots/settings_app_notes.png
rename to packages/app/screenshots/settings_app_notes.png
diff --git a/packages/neon/screenshots/settings_dark.png b/packages/app/screenshots/settings_dark.png
similarity index 100%
rename from packages/neon/screenshots/settings_dark.png
rename to packages/app/screenshots/settings_dark.png
diff --git a/packages/neon/screenshots/settings_light.png b/packages/app/screenshots/settings_light.png
similarity index 100%
rename from packages/neon/screenshots/settings_light.png
rename to packages/app/screenshots/settings_light.png
diff --git a/packages/neon/screenshots/settings_oled.png b/packages/app/screenshots/settings_oled.png
similarity index 100%
rename from packages/neon/screenshots/settings_oled.png
rename to packages/app/screenshots/settings_oled.png
diff --git a/packages/neon/test_driver/integration_test.dart b/packages/app/test_driver/integration_test.dart
similarity index 100%
rename from packages/neon/test_driver/integration_test.dart
rename to packages/app/test_driver/integration_test.dart
diff --git a/packages/dynamite/pubspec.yaml b/packages/dynamite/pubspec.yaml
index 6e6e5a57..74d85ac3 100644
--- a/packages/dynamite/pubspec.yaml
+++ b/packages/dynamite/pubspec.yaml
@@ -12,7 +12,6 @@ dependencies:
   path: ^1.8.2
 
 dev_dependencies:
-  build_runner: ^2.2.1
   json_serializable: ^6.3.2
   nit_picking:
     git:
diff --git a/packages/neon/android/app/src/main/res/drawable-hdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-hdpi/android12splash.png
deleted file mode 100644
index a9789e6d..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-hdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-mdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-mdpi/android12splash.png
deleted file mode 100644
index d28d8f2b..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-mdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-night-hdpi/android12splash.png
deleted file mode 100644
index a9789e6d..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-night-hdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-night-mdpi/android12splash.png
deleted file mode 100644
index d28d8f2b..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-night-mdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
deleted file mode 100644
index e29b777d..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-night-xhdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
deleted file mode 100644
index 44a76ece..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
deleted file mode 100644
index bc19fa53..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-xhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-xhdpi/android12splash.png
deleted file mode 100644
index e29b777d..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-xhdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-xxhdpi/android12splash.png
deleted file mode 100644
index 44a76ece..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-xxhdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/packages/neon/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
deleted file mode 100644
index bc19fa53..00000000
Binary files a/packages/neon/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and /dev/null differ
diff --git a/packages/neon/lib/main.dart b/packages/neon/lib/main.dart
deleted file mode 100644
index 2bbd9c50..00000000
--- a/packages/neon/lib/main.dart
+++ /dev/null
@@ -1,87 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:neon/src/neon.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-Future main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-
-  FlutterNativeSplash.preserve(widgetsBinding: WidgetsBinding.instance);
-
-  final sharedPreferences = await SharedPreferences.getInstance();
-
-  final platform = await getNeonPlatform();
-  final cache = Cache(platform);
-  await cache.init();
-  final requestManager = RequestManager(cache);
-  final allAppImplementations = getAppImplementations(sharedPreferences, requestManager, platform);
-
-  final packageInfo = await PackageInfo.fromPlatform();
-
-  final globalOptions = GlobalOptions(
-    AppStorage('global', sharedPreferences),
-    packageInfo,
-  );
-
-  final accountsBloc = AccountsBloc(
-    requestManager,
-    platform,
-    AppStorage('accounts', sharedPreferences),
-    sharedPreferences,
-    globalOptions,
-    allAppImplementations,
-  );
-  final pushNotificationsBloc = PushNotificationsBloc(
-    accountsBloc,
-    sharedPreferences,
-    globalOptions,
-    platform,
-  );
-  final firstLaunchBloc = FirstLaunchBloc(sharedPreferences);
-  final nextPushBloc = NextPushBloc(accountsBloc, globalOptions);
-
-  runApp(
-    MultiProvider(
-      providers: [
-        Provider<SharedPreferences>(
-          create: (final _) => sharedPreferences,
-        ),
-        Provider<NeonPlatform>(
-          create: (final _) => platform,
-        ),
-        Provider<GlobalOptions>(
-          create: (final _) => globalOptions,
-        ),
-        Provider<RequestManager>(
-          create: (final _) => requestManager,
-        ),
-        Provider<AccountsBloc>(
-          create: (final _) => accountsBloc,
-        ),
-        Provider<PushNotificationsBloc>(
-          create: (final _) => pushNotificationsBloc,
-        ),
-        Provider<FirstLaunchBloc>(
-          create: (final _) => firstLaunchBloc,
-        ),
-        Provider<NextPushBloc>(
-          create: (final _) => nextPushBloc,
-        ),
-        Provider<List<AppImplementation>>(
-          create: (final _) => allAppImplementations,
-        ),
-        Provider<PackageInfo>(
-          create: (final _) => packageInfo,
-        ),
-      ],
-      child: NeonApp(
-        accountsBloc: accountsBloc,
-        sharedPreferences: sharedPreferences,
-        platform: platform,
-        globalOptions: globalOptions,
-      ),
-    ),
-  );
-}
diff --git a/packages/neon/lib/src/neon.dart b/packages/neon/lib/src/neon.dart
deleted file mode 100644
index 58f96fb0..00000000
--- a/packages/neon/lib/src/neon.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-library neon;
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:math';
-
-import 'package:crypto/crypto.dart';
-import 'package:file_picker/file_picker.dart';
-import 'package:filesize/filesize.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.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_svg/flutter_svg.dart';
-import 'package:http/http.dart';
-import 'package:intl/intl_standalone.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/apps/files/app.dart';
-import 'package:neon/src/apps/news/app.dart';
-import 'package:neon/src/apps/notes/app.dart';
-import 'package:neon/src/apps/notifications/app.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/models/push_notification.dart';
-import 'package:nextcloud/nextcloud.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:provider/provider.dart';
-import 'package:quick_actions/quick_actions.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:settings/settings.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:sort_box/sort_box.dart';
-import 'package:sqflite/sqflite.dart';
-import 'package:sqflite_common_ffi/sqflite_ffi.dart';
-import 'package:tray_manager/tray_manager.dart' as tray;
-import 'package:unifiedpush/unifiedpush.dart';
-import 'package:url_launcher/url_launcher_string.dart';
-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 'blocs/accounts.dart';
-part 'blocs/apps.dart';
-part 'blocs/capabilities.dart';
-part 'blocs/first_launch.dart';
-part 'blocs/login.dart';
-part 'blocs/next_push.dart';
-part 'blocs/push_notifications.dart';
-part 'blocs/user_details.dart';
-part 'blocs/user_status.dart';
-part 'pages/account_settings.dart';
-part 'pages/home.dart';
-part 'pages/login.dart';
-part 'pages/nextcloud_app_settings.dart';
-part 'pages/settings.dart';
-part 'platform/abstract.dart';
-part 'platform/android.dart';
-part 'platform/linux.dart';
-part 'platform/platform.dart';
-part 'utils/account_options.dart';
-part 'utils/app_implementation.dart';
-part 'utils/bloc.dart';
-part 'utils/confirmation_dialog.dart';
-part 'utils/global.dart';
-part 'utils/global_options.dart';
-part 'utils/global_popups.dart';
-part 'utils/hex_color.dart';
-part 'utils/localizations.dart';
-part 'utils/missing_permission_exception.dart';
-part 'utils/nextcloud_app_specific_options.dart';
-part 'utils/push_utils.dart';
-part 'utils/rename_dialog.dart';
-part 'utils/request_manager.dart';
-part 'utils/result.dart';
-part 'utils/save_file.dart';
-part 'utils/settings_export_helper.dart';
-part 'utils/sort_box_builder.dart';
-part 'utils/sort_box_order_option_values.dart';
-part 'utils/storage.dart';
-part 'utils/theme.dart';
-part 'utils/validators.dart';
-part 'widgets/account_avatar.dart';
-part 'widgets/account_settings_tile.dart';
-part 'widgets/account_tile.dart';
-part 'widgets/app_implementation_icon.dart';
-part 'widgets/cached_api_image.dart';
-part 'widgets/cached_image.dart';
-part 'widgets/cached_url_image.dart';
-part 'widgets/custom_dialog.dart';
-part 'widgets/custom_linear_progress_indicator.dart';
-part 'widgets/custom_listview.dart';
-part 'widgets/exception.dart';
-part 'widgets/image_wrapper.dart';
-part 'widgets/neon_logo.dart';
-part 'widgets/nextcloud_logo.dart';
-part 'widgets/no_animation_page_route.dart';
-part 'widgets/relative_time.dart';
-part 'widgets/result_builder.dart';
-part 'widgets/text_settings_tile.dart';
diff --git a/packages/neon/neon/.gitignore b/packages/neon/neon/.gitignore
new file mode 100644
index 00000000..7944852f
--- /dev/null
+++ b/packages/neon/neon/.gitignore
@@ -0,0 +1,48 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/neon/.metadata b/packages/neon/neon/.metadata
similarity index 100%
rename from packages/neon/.metadata
rename to packages/neon/neon/.metadata
diff --git a/packages/neon/neon/LICENSE b/packages/neon/neon/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/packages/neon/neon/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/packages/neon/analysis_options.yaml b/packages/neon/neon/analysis_options.yaml
similarity index 100%
rename from packages/neon/analysis_options.yaml
rename to packages/neon/neon/analysis_options.yaml
diff --git a/packages/neon/assets/LEGALESE.txt b/packages/neon/neon/assets/LEGALESE.txt
similarity index 100%
rename from packages/neon/assets/LEGALESE.txt
rename to packages/neon/neon/assets/LEGALESE.txt
diff --git a/packages/neon/assets/logo_neon.svg b/packages/neon/neon/assets/logo_neon.svg
similarity index 100%
rename from packages/neon/assets/logo_neon.svg
rename to packages/neon/neon/assets/logo_neon.svg
diff --git a/packages/neon/assets/logo_nextcloud.svg b/packages/neon/neon/assets/logo_nextcloud.svg
similarity index 100%
rename from packages/neon/assets/logo_nextcloud.svg
rename to packages/neon/neon/assets/logo_nextcloud.svg
diff --git a/packages/neon/l10n.yaml b/packages/neon/neon/l10n.yaml
similarity index 100%
rename from packages/neon/l10n.yaml
rename to packages/neon/neon/l10n.yaml
diff --git a/packages/neon/lib/l10n/en.arb b/packages/neon/neon/lib/l10n/en.arb
similarity index 98%
rename from packages/neon/lib/l10n/en.arb
rename to packages/neon/neon/lib/l10n/en.arb
index b5802a01..2d86b024 100644
--- a/packages/neon/lib/l10n/en.arb
+++ b/packages/neon/neon/lib/l10n/en.arb
@@ -1,6 +1,12 @@
 {
   "@@locale": "en",
   "appName": "Nextcloud Neon",
+  "appImplementationName": "{app, select, core{Server} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}",
+  "@appImplementationName": {
+    "placeholders": {
+      "app": {}
+    }
+  },
   "loginAgain": "Login again",
   "loginOpenAgain": "Open again",
   "loginSwitchToBrowserWindow": "Please switch to the browser window that just opened and proceed there",
@@ -132,8 +138,6 @@
   "accountOptionsInitialApp": "App to show initially",
   "accountOptionsAutomatic": "Automatic",
   "licenses": "Licenses",
-  "coreName": "Server",
-  "filesName": "Files",
   "filesUploadFiles": "Upload files",
   "filesUploadImages": "Upload images",
   "filesUploadCamera": "Upload from camera",
@@ -196,7 +200,6 @@
   "filesOptionsDownloadQueueParallelism": "Download queue parallelism",
   "filesOptionsUploadSizeWarning": "Upload size warning",
   "filesOptionsDownloadSizeWarning": "Download size warning",
-  "newsName": "News",
   "newsAddFeed": "Add feed",
   "newsFolder": "Folder",
   "newsFolderRoot": "Root Folder",
@@ -261,7 +264,6 @@
   "newsOptionsFoldersSortPropertyUnreadCount": "Unread count",
   "newsOptionsFoldersSortOrder": "Sort order of folders",
   "newsOptionsDefaultFolderViewType": "What should be shown first when opening a folder",
-  "notesName": "Notes",
   "notesNote": "Note",
   "notesNotes": "Notes",
   "notesCategories": "Categories",
@@ -302,6 +304,5 @@
   "notesOptionsCategoriesSortProperty": "How to sort categories",
   "notesOptionsCategoriesSortPropertyAlphabetical": "Alphabetical",
   "notesOptionsCategoriesSortPropertyNotesCount": "Count of notes",
-  "notificationsName": "Notifications",
   "notificationsNextcloudAppNotImplementedYet": "Sorry, this Nextcloud app has not been implemented yet"
 }
diff --git a/packages/neon/lib/l10n/localizations.dart b/packages/neon/neon/lib/l10n/localizations.dart
similarity index 98%
rename from packages/neon/lib/l10n/localizations.dart
rename to packages/neon/neon/lib/l10n/localizations.dart
index 0a1ae2f9..da1c6240 100644
--- a/packages/neon/lib/l10n/localizations.dart
+++ b/packages/neon/neon/lib/l10n/localizations.dart
@@ -95,6 +95,12 @@ abstract class AppLocalizations {
   /// **'Nextcloud Neon'**
   String get appName;
 
+  /// No description provided for @appImplementationName.
+  ///
+  /// In en, this message translates to:
+  /// **'{app, select, core{Server} files{Files} news{News} notes{Notes} notifications{Notifications} other{}}'**
+  String appImplementationName(String app);
+
   /// No description provided for @loginAgain.
   ///
   /// In en, this message translates to:
@@ -593,18 +599,6 @@ abstract class AppLocalizations {
   /// **'Licenses'**
   String get licenses;
 
-  /// No description provided for @coreName.
-  ///
-  /// In en, this message translates to:
-  /// **'Server'**
-  String get coreName;
-
-  /// No description provided for @filesName.
-  ///
-  /// In en, this message translates to:
-  /// **'Files'**
-  String get filesName;
-
   /// No description provided for @filesUploadFiles.
   ///
   /// In en, this message translates to:
@@ -773,12 +767,6 @@ abstract class AppLocalizations {
   /// **'Download size warning'**
   String get filesOptionsDownloadSizeWarning;
 
-  /// No description provided for @newsName.
-  ///
-  /// In en, this message translates to:
-  /// **'News'**
-  String get newsName;
-
   /// No description provided for @newsAddFeed.
   ///
   /// In en, this message translates to:
@@ -1037,12 +1025,6 @@ abstract class AppLocalizations {
   /// **'What should be shown first when opening a folder'**
   String get newsOptionsDefaultFolderViewType;
 
-  /// No description provided for @notesName.
-  ///
-  /// In en, this message translates to:
-  /// **'Notes'**
-  String get notesName;
-
   /// No description provided for @notesNote.
   ///
   /// In en, this message translates to:
@@ -1199,12 +1181,6 @@ abstract class AppLocalizations {
   /// **'Count of notes'**
   String get notesOptionsCategoriesSortPropertyNotesCount;
 
-  /// No description provided for @notificationsName.
-  ///
-  /// In en, this message translates to:
-  /// **'Notifications'**
-  String get notificationsName;
-
   /// No description provided for @notificationsNextcloudAppNotImplementedYet.
   ///
   /// In en, this message translates to:
diff --git a/packages/neon/lib/l10n/localizations_en.dart b/packages/neon/neon/lib/l10n/localizations_en.dart
similarity index 97%
rename from packages/neon/lib/l10n/localizations_en.dart
rename to packages/neon/neon/lib/l10n/localizations_en.dart
index 917ca1ec..d69ae1e7 100644
--- a/packages/neon/lib/l10n/localizations_en.dart
+++ b/packages/neon/neon/lib/l10n/localizations_en.dart
@@ -1,3 +1,5 @@
+import 'package:intl/intl.dart' as intl;
+
 import 'localizations.dart';
 
 /// The translations for English (`en`).
@@ -7,6 +9,22 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get appName => 'Nextcloud Neon';
 
+  @override
+  String appImplementationName(String app) {
+    String _temp0 = intl.Intl.selectLogic(
+      app,
+      {
+        'core': 'Server',
+        'files': 'Files',
+        'news': 'News',
+        'notes': 'Notes',
+        'notifications': 'Notifications',
+        'other': '',
+      },
+    );
+    return '$_temp0';
+  }
+
   @override
   String get loginAgain => 'Login again';
 
@@ -273,12 +291,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get licenses => 'Licenses';
 
-  @override
-  String get coreName => 'Server';
-
-  @override
-  String get filesName => 'Files';
-
   @override
   String get filesUploadFiles => 'Upload files';
 
@@ -371,9 +383,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get filesOptionsDownloadSizeWarning => 'Download size warning';
 
-  @override
-  String get newsName => 'News';
-
   @override
   String get newsAddFeed => 'Add feed';
 
@@ -509,9 +518,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get newsOptionsDefaultFolderViewType => 'What should be shown first when opening a folder';
 
-  @override
-  String get notesName => 'Notes';
-
   @override
   String get notesNote => 'Note';
 
@@ -594,9 +600,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get notesOptionsCategoriesSortPropertyNotesCount => 'Count of notes';
 
-  @override
-  String get notificationsName => 'Notifications';
-
   @override
   String get notificationsNextcloudAppNotImplementedYet => 'Sorry, this Nextcloud app has not been implemented yet';
 }
diff --git a/packages/neon/neon/lib/neon.dart b/packages/neon/neon/lib/neon.dart
new file mode 100644
index 00000000..18757966
--- /dev/null
+++ b/packages/neon/neon/lib/neon.dart
@@ -0,0 +1,208 @@
+library neon;
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:math';
+
+import 'package:collection/collection.dart';
+import 'package:crypto/crypto.dart';
+import 'package:file_picker/file_picker.dart';
+import 'package:filesize/filesize.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.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_svg/flutter_svg.dart';
+import 'package:http/http.dart';
+import 'package:intl/intl_standalone.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:neon/l10n/localizations.dart';
+import 'package:neon/src/models/account.dart';
+import 'package:neon/src/models/push_notification.dart';
+import 'package:neon_notifications/neon_notifications.dart';
+import 'package:nextcloud/nextcloud.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:provider/provider.dart';
+import 'package:quick_actions/quick_actions.dart';
+import 'package:rxdart/rxdart.dart';
+import 'package:settings/settings.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:sort_box/sort_box.dart';
+import 'package:sqflite/sqflite.dart';
+import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:tray_manager/tray_manager.dart' as tray;
+import 'package:unifiedpush/unifiedpush.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:window_manager/window_manager.dart';
+import 'package:xdg_directories/xdg_directories.dart' as xdg;
+
+export 'l10n/localizations.dart';
+export 'src/models/account.dart';
+export 'src/models/push_notification.dart';
+
+part 'src/app.dart';
+part 'src/blocs/accounts.dart';
+part 'src/blocs/apps.dart';
+part 'src/blocs/capabilities.dart';
+part 'src/blocs/first_launch.dart';
+part 'src/blocs/login.dart';
+part 'src/blocs/next_push.dart';
+part 'src/blocs/push_notifications.dart';
+part 'src/blocs/user_details.dart';
+part 'src/blocs/user_status.dart';
+part 'src/pages/account_settings.dart';
+part 'src/pages/home.dart';
+part 'src/pages/login.dart';
+part 'src/pages/nextcloud_app_settings.dart';
+part 'src/pages/settings.dart';
+part 'src/platform/abstract.dart';
+part 'src/platform/android.dart';
+part 'src/platform/linux.dart';
+part 'src/platform/platform.dart';
+part 'src/utils/account_options.dart';
+part 'src/utils/app_implementation.dart';
+part 'src/utils/bloc.dart';
+part 'src/utils/confirmation_dialog.dart';
+part 'src/utils/global.dart';
+part 'src/utils/global_options.dart';
+part 'src/utils/global_popups.dart';
+part 'src/utils/hex_color.dart';
+part 'src/utils/localizations.dart';
+part 'src/utils/missing_permission_exception.dart';
+part 'src/utils/nextcloud_app_specific_options.dart';
+part 'src/utils/push_utils.dart';
+part 'src/utils/rename_dialog.dart';
+part 'src/utils/request_manager.dart';
+part 'src/utils/result.dart';
+part 'src/utils/save_file.dart';
+part 'src/utils/settings_export_helper.dart';
+part 'src/utils/sort_box_builder.dart';
+part 'src/utils/sort_box_order_option_values.dart';
+part 'src/utils/storage.dart';
+part 'src/utils/theme.dart';
+part 'src/utils/validators.dart';
+part 'src/widgets/account_avatar.dart';
+part 'src/widgets/account_settings_tile.dart';
+part 'src/widgets/account_tile.dart';
+part 'src/widgets/app_implementation_icon.dart';
+part 'src/widgets/cached_api_image.dart';
+part 'src/widgets/cached_image.dart';
+part 'src/widgets/cached_url_image.dart';
+part 'src/widgets/custom_dialog.dart';
+part 'src/widgets/custom_linear_progress_indicator.dart';
+part 'src/widgets/custom_listview.dart';
+part 'src/widgets/exception.dart';
+part 'src/widgets/image_wrapper.dart';
+part 'src/widgets/neon_logo.dart';
+part 'src/widgets/nextcloud_logo.dart';
+part 'src/widgets/no_animation_page_route.dart';
+part 'src/widgets/relative_time.dart';
+part 'src/widgets/result_builder.dart';
+part 'src/widgets/text_settings_tile.dart';
+
+Future runNeon({
+  required final List<AppImplementation> Function(SharedPreferences, RequestManager, NeonPlatform)
+      getAppImplementations,
+  required final WidgetsBinding binding,
+  final SharedPreferences? sharedPreferencesOverride,
+  final Account? account,
+  final bool firstLaunchDisabled = false,
+  final bool nextPushDisabled = false,
+}) async {
+  FlutterNativeSplash.preserve(widgetsBinding: binding);
+
+  final sharedPreferences = sharedPreferencesOverride ?? await SharedPreferences.getInstance();
+
+  final platform = await getNeonPlatform();
+  final cache = Cache(platform);
+  await cache.init();
+  final requestManager = RequestManager(cache);
+  final allAppImplementations = getAppImplementations(sharedPreferences, requestManager, platform);
+
+  final packageInfo = await PackageInfo.fromPlatform();
+
+  final globalOptions = GlobalOptions(
+    AppStorage('global', sharedPreferences),
+    packageInfo,
+  );
+
+  final accountsBloc = AccountsBloc(
+    requestManager,
+    platform,
+    AppStorage('accounts', sharedPreferences),
+    sharedPreferences,
+    globalOptions,
+    allAppImplementations,
+  );
+  if (account != null) {
+    accountsBloc
+      ..addAccount(account)
+      ..setActiveAccount(account);
+  }
+  final pushNotificationsBloc = PushNotificationsBloc(
+    accountsBloc,
+    sharedPreferences,
+    globalOptions,
+    platform,
+  );
+  final firstLaunchBloc = FirstLaunchBloc(
+    sharedPreferences,
+    disabled: firstLaunchDisabled,
+  );
+  final nextPushBloc = NextPushBloc(
+    accountsBloc,
+    globalOptions,
+    disabled: nextPushDisabled,
+  );
+
+  runApp(
+    MultiProvider(
+      providers: [
+        Provider<SharedPreferences>(
+          create: (final _) => sharedPreferences,
+        ),
+        Provider<NeonPlatform>(
+          create: (final _) => platform,
+        ),
+        Provider<GlobalOptions>(
+          create: (final _) => globalOptions,
+        ),
+        Provider<RequestManager>(
+          create: (final _) => requestManager,
+        ),
+        Provider<AccountsBloc>(
+          create: (final _) => accountsBloc,
+        ),
+        Provider<PushNotificationsBloc>(
+          create: (final _) => pushNotificationsBloc,
+        ),
+        Provider<FirstLaunchBloc>(
+          create: (final _) => firstLaunchBloc,
+        ),
+        Provider<NextPushBloc>(
+          create: (final _) => nextPushBloc,
+        ),
+        Provider<List<AppImplementation>>(
+          create: (final _) => allAppImplementations,
+        ),
+        Provider<PackageInfo>(
+          create: (final _) => packageInfo,
+        ),
+      ],
+      child: NeonApp(
+        accountsBloc: accountsBloc,
+        sharedPreferences: sharedPreferences,
+        platform: platform,
+        globalOptions: globalOptions,
+      ),
+    ),
+  );
+}
diff --git a/packages/neon/lib/src/app.dart b/packages/neon/neon/lib/src/app.dart
similarity index 92%
rename from packages/neon/lib/src/app.dart
rename to packages/neon/neon/lib/src/app.dart
index 7fd4fff5..a8f1aefc 100644
--- a/packages/neon/lib/src/app.dart
+++ b/packages/neon/neon/lib/src/app.dart
@@ -1,4 +1,4 @@
-part of 'neon.dart';
+part of '../../neon.dart';
 
 class NeonApp extends StatefulWidget {
   const NeonApp({
@@ -70,6 +70,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
             name: 'home',
           );
           Widget builder(final context) => Scaffold(
+                resizeToAvoidBottomInset: false,
                 body: Stack(
                   children: [
                     _globalPopups,
@@ -311,27 +312,19 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
             option: widget.globalOptions.themeOLEDAsDark,
             builder: (final context, final themeOLEDAsDark) => OptionBuilder(
               option: widget.globalOptions.themeKeepOriginalAccentColor,
-              builder: (final context, final themeKeepOriginalAccentColor) {
-                if (!platformBrightnessSnapshot.hasData ||
-                    themeMode == null ||
-                    themeOLEDAsDark == null ||
-                    themeKeepOriginalAccentColor == null) {
-                  return Container();
-                }
-                return MaterialApp(
-                  localizationsDelegates: AppLocalizations.localizationsDelegates,
-                  supportedLocales: AppLocalizations.supportedLocales,
-                  navigatorKey: _navigatorKey,
-                  theme: getThemeFromNextcloudTheme(
-                    _nextcloudTheme,
-                    themeMode,
-                    platformBrightnessSnapshot.data!,
-                    oledAsDark: themeOLEDAsDark,
-                    keepOriginalAccentColor: themeKeepOriginalAccentColor,
-                  ),
-                  home: Container(),
-                );
-              },
+              builder: (final context, final themeKeepOriginalAccentColor) => MaterialApp(
+                localizationsDelegates: AppLocalizations.localizationsDelegates,
+                supportedLocales: AppLocalizations.supportedLocales,
+                navigatorKey: _navigatorKey,
+                theme: getThemeFromNextcloudTheme(
+                  _nextcloudTheme,
+                  themeMode ?? ThemeMode.system,
+                  platformBrightnessSnapshot.data ?? Brightness.light,
+                  oledAsDark: themeOLEDAsDark ?? false,
+                  keepOriginalAccentColor: themeKeepOriginalAccentColor ?? false,
+                ),
+                home: Container(),
+              ),
             ),
           ),
         ),
diff --git a/packages/neon/lib/src/blocs/accounts.dart b/packages/neon/neon/lib/src/blocs/accounts.dart
similarity index 99%
rename from packages/neon/lib/src/blocs/accounts.dart
rename to packages/neon/neon/lib/src/blocs/accounts.dart
index bf494864..b542cfd4 100644
--- a/packages/neon/lib/src/blocs/accounts.dart
+++ b/packages/neon/neon/lib/src/blocs/accounts.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class AccountsBlocEvents {
   void addAccount(final Account account);
diff --git a/packages/neon/lib/src/blocs/apps.dart b/packages/neon/neon/lib/src/blocs/apps.dart
similarity index 99%
rename from packages/neon/lib/src/blocs/apps.dart
rename to packages/neon/neon/lib/src/blocs/apps.dart
index da6b957e..5cc65586 100644
--- a/packages/neon/lib/src/blocs/apps.dart
+++ b/packages/neon/neon/lib/src/blocs/apps.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 typedef NextcloudApp = NextcloudCoreNavigationApps_Ocs_Data;
 
diff --git a/packages/neon/lib/src/blocs/capabilities.dart b/packages/neon/neon/lib/src/blocs/capabilities.dart
similarity index 97%
rename from packages/neon/lib/src/blocs/capabilities.dart
rename to packages/neon/neon/lib/src/blocs/capabilities.dart
index 7742089f..04c7fcd1 100644
--- a/packages/neon/lib/src/blocs/capabilities.dart
+++ b/packages/neon/neon/lib/src/blocs/capabilities.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 typedef Capabilities = NextcloudCoreServerCapabilities_Ocs_Data;
 typedef NextcloudTheme = NextcloudCoreServerCapabilities_Ocs_Data_Capabilities_Theming;
diff --git a/packages/neon/lib/src/blocs/first_launch.dart b/packages/neon/neon/lib/src/blocs/first_launch.dart
similarity index 96%
rename from packages/neon/lib/src/blocs/first_launch.dart
rename to packages/neon/neon/lib/src/blocs/first_launch.dart
index e2755d2a..92bf2ab4 100644
--- a/packages/neon/lib/src/blocs/first_launch.dart
+++ b/packages/neon/neon/lib/src/blocs/first_launch.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class FirstLaunchBlocEvents {}
 
diff --git a/packages/neon/lib/src/blocs/login.dart b/packages/neon/neon/lib/src/blocs/login.dart
similarity index 99%
rename from packages/neon/lib/src/blocs/login.dart
rename to packages/neon/neon/lib/src/blocs/login.dart
index 70fd7f8f..83f3d5f4 100644
--- a/packages/neon/lib/src/blocs/login.dart
+++ b/packages/neon/neon/lib/src/blocs/login.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class LoginBlocEvents {
   void setServerURL(final String? url);
diff --git a/packages/neon/lib/src/blocs/next_push.dart b/packages/neon/neon/lib/src/blocs/next_push.dart
similarity index 98%
rename from packages/neon/lib/src/blocs/next_push.dart
rename to packages/neon/neon/lib/src/blocs/next_push.dart
index 28027cf2..d13b35a9 100644
--- a/packages/neon/lib/src/blocs/next_push.dart
+++ b/packages/neon/neon/lib/src/blocs/next_push.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class NextPushBlocEvents {}
 
diff --git a/packages/neon/lib/src/blocs/push_notifications.dart b/packages/neon/neon/lib/src/blocs/push_notifications.dart
similarity index 99%
rename from packages/neon/lib/src/blocs/push_notifications.dart
rename to packages/neon/neon/lib/src/blocs/push_notifications.dart
index 077a4058..794218e8 100644
--- a/packages/neon/lib/src/blocs/push_notifications.dart
+++ b/packages/neon/neon/lib/src/blocs/push_notifications.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class PushNotificationsBlocEvents {}
 
diff --git a/packages/neon/lib/src/blocs/user_details.dart b/packages/neon/neon/lib/src/blocs/user_details.dart
similarity index 97%
rename from packages/neon/lib/src/blocs/user_details.dart
rename to packages/neon/neon/lib/src/blocs/user_details.dart
index cd66e370..4227f76a 100644
--- a/packages/neon/lib/src/blocs/user_details.dart
+++ b/packages/neon/neon/lib/src/blocs/user_details.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class UserDetailsBlocEvents {}
 
diff --git a/packages/neon/lib/src/blocs/user_status.dart b/packages/neon/neon/lib/src/blocs/user_status.dart
similarity index 98%
rename from packages/neon/lib/src/blocs/user_status.dart
rename to packages/neon/neon/lib/src/blocs/user_status.dart
index 3df6d1e9..7704657e 100644
--- a/packages/neon/lib/src/blocs/user_status.dart
+++ b/packages/neon/neon/lib/src/blocs/user_status.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class UserStatusBlocEvents {}
 
diff --git a/packages/neon/lib/src/models/account.dart b/packages/neon/neon/lib/src/models/account.dart
similarity index 100%
rename from packages/neon/lib/src/models/account.dart
rename to packages/neon/neon/lib/src/models/account.dart
diff --git a/packages/neon/lib/src/models/account.g.dart b/packages/neon/neon/lib/src/models/account.g.dart
similarity index 100%
rename from packages/neon/lib/src/models/account.g.dart
rename to packages/neon/neon/lib/src/models/account.g.dart
diff --git a/packages/neon/lib/src/models/push_notification.dart b/packages/neon/neon/lib/src/models/push_notification.dart
similarity index 100%
rename from packages/neon/lib/src/models/push_notification.dart
rename to packages/neon/neon/lib/src/models/push_notification.dart
diff --git a/packages/neon/lib/src/models/push_notification.g.dart b/packages/neon/neon/lib/src/models/push_notification.g.dart
similarity index 100%
rename from packages/neon/lib/src/models/push_notification.g.dart
rename to packages/neon/neon/lib/src/models/push_notification.g.dart
diff --git a/packages/neon/lib/src/pages/account_settings.dart b/packages/neon/neon/lib/src/pages/account_settings.dart
similarity index 99%
rename from packages/neon/lib/src/pages/account_settings.dart
rename to packages/neon/neon/lib/src/pages/account_settings.dart
index 0bf7bccf..f26e0ac1 100644
--- a/packages/neon/lib/src/pages/account_settings.dart
+++ b/packages/neon/neon/lib/src/pages/account_settings.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AccountSettingsPage extends StatelessWidget {
   AccountSettingsPage({
diff --git a/packages/neon/lib/src/pages/home.dart b/packages/neon/neon/lib/src/pages/home.dart
similarity index 99%
rename from packages/neon/lib/src/pages/home.dart
rename to packages/neon/neon/lib/src/pages/home.dart
index 77a90d39..bdbd3498 100644
--- a/packages/neon/lib/src/pages/home.dart
+++ b/packages/neon/neon/lib/src/pages/home.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 const kQuickBarWidth = kAvatarSize + 20;
 
@@ -79,12 +79,12 @@ class _HomePageState extends State<HomePage> {
                 if (!mounted) {
                   return;
                 }
+                var name = AppLocalizations.of(context).appImplementationName(id);
+                if (name == '') {
+                  name = id;
+                }
                 await _showProblem(
-                  AppLocalizations.of(context).errorUnsupportedVersion(
-                    id == 'core'
-                        ? AppLocalizations.of(context).coreName
-                        : appsResult.data!.singleWhere((final a) => a.id == id).name(context),
-                  ),
+                  AppLocalizations.of(context).errorUnsupportedVersion(name),
                 );
               }
             } catch (e, s) {
@@ -154,6 +154,7 @@ class _HomePageState extends State<HomePage> {
     await Navigator.of(context).push(
       MaterialPageRoute(
         builder: (final context) => Scaffold(
+          resizeToAvoidBottomInset: false,
           appBar: AppBar(
             title: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/packages/neon/lib/src/pages/login.dart b/packages/neon/neon/lib/src/pages/login.dart
similarity index 99%
rename from packages/neon/lib/src/pages/login.dart
rename to packages/neon/neon/lib/src/pages/login.dart
index e1f4ee2e..6a00e2e2 100644
--- a/packages/neon/lib/src/pages/login.dart
+++ b/packages/neon/neon/lib/src/pages/login.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class LoginPage extends StatefulWidget {
   const LoginPage({
@@ -109,6 +109,7 @@ class _LoginPageState extends State<LoginPage> {
             builder: (final context, final serverURLSnapshot) => StreamBuilder<ServerConnectionState?>(
               stream: _loginBloc.serverConnectionState,
               builder: (final context, final serverConnectionStateSnapshot) => Scaffold(
+                resizeToAvoidBottomInset: true,
                 appBar: serverConnectionStateSnapshot.data == ServerConnectionState.success ||
                         (accountsSnapshot.data?.isNotEmpty ?? false)
                     ? AppBar(
diff --git a/packages/neon/lib/src/pages/nextcloud_app_settings.dart b/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
similarity index 98%
rename from packages/neon/lib/src/pages/nextcloud_app_settings.dart
rename to packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
index dca17aeb..21486818 100644
--- a/packages/neon/lib/src/pages/nextcloud_app_settings.dart
+++ b/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class NextcloudAppSettingsPage extends StatelessWidget {
   const NextcloudAppSettingsPage({
diff --git a/packages/neon/lib/src/pages/settings.dart b/packages/neon/neon/lib/src/pages/settings.dart
similarity index 99%
rename from packages/neon/lib/src/pages/settings.dart
rename to packages/neon/neon/lib/src/pages/settings.dart
index eeb42dec..ba999b50 100644
--- a/packages/neon/lib/src/pages/settings.dart
+++ b/packages/neon/neon/lib/src/pages/settings.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class SettingsPage extends StatefulWidget {
   const SettingsPage({
diff --git a/packages/neon/lib/src/platform/abstract.dart b/packages/neon/neon/lib/src/platform/abstract.dart
similarity index 96%
rename from packages/neon/lib/src/platform/abstract.dart
rename to packages/neon/neon/lib/src/platform/abstract.dart
index 1c49580f..7bdd2616 100644
--- a/packages/neon/lib/src/platform/abstract.dart
+++ b/packages/neon/neon/lib/src/platform/abstract.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class NeonPlatform {
   NeonPlatform({
diff --git a/packages/neon/lib/src/platform/android.dart b/packages/neon/neon/lib/src/platform/android.dart
similarity index 96%
rename from packages/neon/lib/src/platform/android.dart
rename to packages/neon/neon/lib/src/platform/android.dart
index f1752a80..3b446a1c 100644
--- a/packages/neon/lib/src/platform/android.dart
+++ b/packages/neon/neon/lib/src/platform/android.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AndroidNeonPlatform extends NeonPlatform {
   AndroidNeonPlatform()
diff --git a/packages/neon/lib/src/platform/linux.dart b/packages/neon/neon/lib/src/platform/linux.dart
similarity index 96%
rename from packages/neon/lib/src/platform/linux.dart
rename to packages/neon/neon/lib/src/platform/linux.dart
index 9301c336..2876972d 100644
--- a/packages/neon/lib/src/platform/linux.dart
+++ b/packages/neon/neon/lib/src/platform/linux.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class LinuxNeonPlatform extends NeonPlatform {
   LinuxNeonPlatform()
diff --git a/packages/neon/lib/src/platform/platform.dart b/packages/neon/neon/lib/src/platform/platform.dart
similarity index 93%
rename from packages/neon/lib/src/platform/platform.dart
rename to packages/neon/neon/lib/src/platform/platform.dart
index fd368762..27846fbf 100644
--- a/packages/neon/lib/src/platform/platform.dart
+++ b/packages/neon/neon/lib/src/platform/platform.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 Future<NeonPlatform> getNeonPlatform() async {
   NeonPlatform? platform;
diff --git a/packages/neon/lib/src/utils/account_options.dart b/packages/neon/neon/lib/src/utils/account_options.dart
similarity index 97%
rename from packages/neon/lib/src/utils/account_options.dart
rename to packages/neon/neon/lib/src/utils/account_options.dart
index c5b2b35d..1b90a1fd 100644
--- a/packages/neon/lib/src/utils/account_options.dart
+++ b/packages/neon/neon/lib/src/utils/account_options.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AccountSpecificOptions {
   AccountSpecificOptions(
diff --git a/packages/neon/lib/src/utils/app_implementation.dart b/packages/neon/neon/lib/src/utils/app_implementation.dart
similarity index 70%
rename from packages/neon/lib/src/utils/app_implementation.dart
rename to packages/neon/neon/lib/src/utils/app_implementation.dart
index fed76100..ac0245c4 100644
--- a/packages/neon/lib/src/utils/app_implementation.dart
+++ b/packages/neon/neon/lib/src/utils/app_implementation.dart
@@ -1,16 +1,4 @@
-part of '../neon.dart';
-
-List<AppImplementation> getAppImplementations(
-  final SharedPreferences sharedPreferences,
-  final RequestManager requestManager,
-  final NeonPlatform platform,
-) =>
-    [
-      FilesApp(sharedPreferences, requestManager, platform),
-      NewsApp(sharedPreferences, requestManager, platform),
-      NotesApp(sharedPreferences, requestManager, platform),
-      NotificationsApp(sharedPreferences, requestManager, platform),
-    ];
+part of '../../neon.dart';
 
 abstract class AppImplementation<T extends Bloc, R extends NextcloudAppSpecificOptions> {
   AppImplementation(
@@ -26,7 +14,7 @@ abstract class AppImplementation<T extends Bloc, R extends NextcloudAppSpecificO
   final RequestManager requestManager;
   final NeonPlatform platform;
 
-  String nameFromLocalization(final AppLocalizations localizations);
+  String nameFromLocalization(final AppLocalizations localizations) => localizations.appImplementationName(id);
   String name(final BuildContext context) => nameFromLocalization(AppLocalizations.of(context));
 
   late final R options;
@@ -48,7 +36,8 @@ abstract class AppImplementation<T extends Bloc, R extends NextcloudAppSpecificO
         height: height,
         width: width,
         child: SvgPicture.asset(
-          'assets/apps/$id.svg',
+          'assets/app.svg',
+          package: 'neon_$id',
           color: color ?? Theme.of(context).colorScheme.primary,
         ),
       );
diff --git a/packages/neon/lib/src/utils/bloc.dart b/packages/neon/neon/lib/src/utils/bloc.dart
similarity index 97%
rename from packages/neon/lib/src/utils/bloc.dart
rename to packages/neon/neon/lib/src/utils/bloc.dart
index 531769ad..195ddfa0 100644
--- a/packages/neon/lib/src/utils/bloc.dart
+++ b/packages/neon/neon/lib/src/utils/bloc.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class Bloc {
   void dispose();
diff --git a/packages/neon/lib/src/utils/confirmation_dialog.dart b/packages/neon/neon/lib/src/utils/confirmation_dialog.dart
similarity index 97%
rename from packages/neon/lib/src/utils/confirmation_dialog.dart
rename to packages/neon/neon/lib/src/utils/confirmation_dialog.dart
index d35a51e4..c538198e 100644
--- a/packages/neon/lib/src/utils/confirmation_dialog.dart
+++ b/packages/neon/neon/lib/src/utils/confirmation_dialog.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 Future<bool> showConfirmationDialog(final BuildContext context, final String title) async =>
     await showDialog<bool>(
diff --git a/packages/neon/lib/src/utils/global.dart b/packages/neon/neon/lib/src/utils/global.dart
similarity index 85%
rename from packages/neon/lib/src/utils/global.dart
rename to packages/neon/neon/lib/src/utils/global.dart
index a8fbaafa..f3721552 100644
--- a/packages/neon/lib/src/utils/global.dart
+++ b/packages/neon/neon/lib/src/utils/global.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class Global {
   static Function(String accountID)? onPushNotificationReceived;
diff --git a/packages/neon/lib/src/utils/global_options.dart b/packages/neon/neon/lib/src/utils/global_options.dart
similarity index 99%
rename from packages/neon/lib/src/utils/global_options.dart
rename to packages/neon/neon/lib/src/utils/global_options.dart
index 8845faf9..da790dfb 100644
--- a/packages/neon/lib/src/utils/global_options.dart
+++ b/packages/neon/neon/lib/src/utils/global_options.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 const unifiedPushNextPushID = 'org.unifiedpush.distributor.nextpush';
 
diff --git a/packages/neon/lib/src/utils/global_popups.dart b/packages/neon/neon/lib/src/utils/global_popups.dart
similarity index 98%
rename from packages/neon/lib/src/utils/global_popups.dart
rename to packages/neon/neon/lib/src/utils/global_popups.dart
index 115e7f4f..bf0a210f 100644
--- a/packages/neon/lib/src/utils/global_popups.dart
+++ b/packages/neon/neon/lib/src/utils/global_popups.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class GlobalPopups extends StatefulWidget {
   const GlobalPopups({
diff --git a/packages/neon/lib/src/utils/hex_color.dart b/packages/neon/neon/lib/src/utils/hex_color.dart
similarity index 89%
rename from packages/neon/lib/src/utils/hex_color.dart
rename to packages/neon/neon/lib/src/utils/hex_color.dart
index 9a6ae42c..2e1e569a 100644
--- a/packages/neon/lib/src/utils/hex_color.dart
+++ b/packages/neon/neon/lib/src/utils/hex_color.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class HexColor extends Color {
   HexColor(final String hexColor)
diff --git a/packages/neon/lib/src/utils/localizations.dart b/packages/neon/neon/lib/src/utils/localizations.dart
similarity index 91%
rename from packages/neon/lib/src/utils/localizations.dart
rename to packages/neon/neon/lib/src/utils/localizations.dart
index 43641d6d..e3b95c84 100644
--- a/packages/neon/lib/src/utils/localizations.dart
+++ b/packages/neon/neon/lib/src/utils/localizations.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 Future<AppLocalizations> appLocalizationsFromSystem() async {
   final parts =
diff --git a/packages/neon/lib/src/utils/missing_permission_exception.dart b/packages/neon/neon/lib/src/utils/missing_permission_exception.dart
similarity index 83%
rename from packages/neon/lib/src/utils/missing_permission_exception.dart
rename to packages/neon/neon/lib/src/utils/missing_permission_exception.dart
index 9b86c9ae..c91fcd6f 100644
--- a/packages/neon/lib/src/utils/missing_permission_exception.dart
+++ b/packages/neon/neon/lib/src/utils/missing_permission_exception.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class MissingPermissionException implements Exception {
   MissingPermissionException(this.permission);
diff --git a/packages/neon/lib/src/utils/nextcloud_app_specific_options.dart b/packages/neon/neon/lib/src/utils/nextcloud_app_specific_options.dart
similarity index 93%
rename from packages/neon/lib/src/utils/nextcloud_app_specific_options.dart
rename to packages/neon/neon/lib/src/utils/nextcloud_app_specific_options.dart
index 93c47157..b2adcad1 100644
--- a/packages/neon/lib/src/utils/nextcloud_app_specific_options.dart
+++ b/packages/neon/neon/lib/src/utils/nextcloud_app_specific_options.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 abstract class NextcloudAppSpecificOptions {
   NextcloudAppSpecificOptions(this.storage);
diff --git a/packages/neon/lib/src/utils/push_utils.dart b/packages/neon/neon/lib/src/utils/push_utils.dart
similarity index 85%
rename from packages/neon/lib/src/utils/push_utils.dart
rename to packages/neon/neon/lib/src/utils/push_utils.dart
index df9bbcdb..556e4ff5 100644
--- a/packages/neon/lib/src/utils/push_utils.dart
+++ b/packages/neon/neon/lib/src/utils/push_utils.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class PushUtils {
   static Future<RSAKeypair> loadRSAKeypair(final AppStorage storage) async {
@@ -75,19 +75,24 @@ class PushUtils {
         final platform = await getNeonPlatform();
         final cache = Cache(platform);
         await cache.init();
-        final requestManager = RequestManager(cache);
-        final allAppImplementations = getAppImplementations(sharedPreferences, requestManager, platform);
+        //final requestManager = RequestManager(cache);
+        //final allAppImplementations = getAppImplementations(sharedPreferences, requestManager, platform);
+        final allAppImplementations = <AppImplementation>[];
 
         final matchingAppImplementations =
             allAppImplementations.where((final a) => a.id == notification.subject.app).toList();
-        late AppImplementation app;
+        AppImplementation? app;
         if (matchingAppImplementations.isNotEmpty) {
           app = matchingAppImplementations.single;
         } else {
-          app = allAppImplementations.singleWhere((final a) => a.id == 'notifications');
+          app = allAppImplementations.firstWhereOrNull((final a) => a.id == 'notifications');
         }
 
-        final appName = app.nameFromLocalization(localizations);
+        final appID = app?.id ?? notification.subject.app;
+        var appName = localizations.appImplementationName(appID ?? '');
+        if (appName == '') {
+          appName = appID ?? 'Nextcloud';
+        }
 
         await localNotificationsPlugin.show(
           _getNotificationID(instance, notification),
@@ -95,10 +100,10 @@ class PushUtils {
           notification.subject.subject,
           NotificationDetails(
             android: AndroidNotificationDetails(
-              app.id,
+              notification.subject.app ?? 'nextcloud',
               appName,
-              groupKey: 'app_${app.id}',
-              icon: '@mipmap/app_${app.id}',
+              groupKey: notification.subject.app != null ? 'app_${notification.subject.app}' : 'nextcloud',
+              icon: '@mipmap/${app != null ? 'app_${app.id}' : 'ic_launcher'}',
               color: themePrimaryColor,
               category: notification.type == 'voip' ? AndroidNotificationCategory.call : null,
               importance: Importance.max,
@@ -106,11 +111,6 @@ class PushUtils {
                   ? (notification.type == 'voip' ? Priority.max : Priority.high)
                   : Priority.defaultPriority,
             ),
-            linux: LinuxNotificationDetails(
-              icon: AssetsLinuxIcon('assets/apps/${app.id}.svg'),
-              urgency:
-                  notification.type == 'voip' ? LinuxNotificationUrgency.critical : LinuxNotificationUrgency.normal,
-            ),
           ),
           payload: json.encode(
             PushNotification(
diff --git a/packages/neon/lib/src/utils/rename_dialog.dart b/packages/neon/neon/lib/src/utils/rename_dialog.dart
similarity index 98%
rename from packages/neon/lib/src/utils/rename_dialog.dart
rename to packages/neon/neon/lib/src/utils/rename_dialog.dart
index 56399086..82dbf330 100644
--- a/packages/neon/lib/src/utils/rename_dialog.dart
+++ b/packages/neon/neon/lib/src/utils/rename_dialog.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 Future<String?> showRenameDialog({
   required final BuildContext context,
diff --git a/packages/neon/lib/src/utils/request_manager.dart b/packages/neon/neon/lib/src/utils/request_manager.dart
similarity index 99%
rename from packages/neon/lib/src/utils/request_manager.dart
rename to packages/neon/neon/lib/src/utils/request_manager.dart
index 269930f7..b15b98f1 100644
--- a/packages/neon/lib/src/utils/request_manager.dart
+++ b/packages/neon/neon/lib/src/utils/request_manager.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class RequestManager {
   RequestManager([
diff --git a/packages/neon/lib/src/utils/result.dart b/packages/neon/neon/lib/src/utils/result.dart
similarity index 96%
rename from packages/neon/lib/src/utils/result.dart
rename to packages/neon/neon/lib/src/utils/result.dart
index ba205c18..73ef6d61 100644
--- a/packages/neon/lib/src/utils/result.dart
+++ b/packages/neon/neon/lib/src/utils/result.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class Result<T> {
   Result(
diff --git a/packages/neon/lib/src/utils/save_file.dart b/packages/neon/neon/lib/src/utils/save_file.dart
similarity index 95%
rename from packages/neon/lib/src/utils/save_file.dart
rename to packages/neon/neon/lib/src/utils/save_file.dart
index 1643da07..3c3cecb6 100644
--- a/packages/neon/lib/src/utils/save_file.dart
+++ b/packages/neon/neon/lib/src/utils/save_file.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 Future<String?> saveFileWithPickDialog(final String fileName, final Uint8List data) async {
   if (Platform.isAndroid || Platform.isIOS) {
diff --git a/packages/neon/lib/src/utils/settings_export_helper.dart b/packages/neon/neon/lib/src/utils/settings_export_helper.dart
similarity index 99%
rename from packages/neon/lib/src/utils/settings_export_helper.dart
rename to packages/neon/neon/lib/src/utils/settings_export_helper.dart
index 321f6bf7..5057fdba 100644
--- a/packages/neon/lib/src/utils/settings_export_helper.dart
+++ b/packages/neon/neon/lib/src/utils/settings_export_helper.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class SettingsExportHelper {
   SettingsExportHelper({
diff --git a/packages/neon/lib/src/utils/sort_box_builder.dart b/packages/neon/neon/lib/src/utils/sort_box_builder.dart
similarity index 97%
rename from packages/neon/lib/src/utils/sort_box_builder.dart
rename to packages/neon/neon/lib/src/utils/sort_box_builder.dart
index 6ee7d063..8226219f 100644
--- a/packages/neon/lib/src/utils/sort_box_builder.dart
+++ b/packages/neon/neon/lib/src/utils/sort_box_builder.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class SortBoxBuilder<T extends Enum, R> extends StatelessWidget {
   const SortBoxBuilder({
diff --git a/packages/neon/lib/src/utils/sort_box_order_option_values.dart b/packages/neon/neon/lib/src/utils/sort_box_order_option_values.dart
similarity index 90%
rename from packages/neon/lib/src/utils/sort_box_order_option_values.dart
rename to packages/neon/neon/lib/src/utils/sort_box_order_option_values.dart
index 4a4553f1..ff56d948 100644
--- a/packages/neon/lib/src/utils/sort_box_order_option_values.dart
+++ b/packages/neon/neon/lib/src/utils/sort_box_order_option_values.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 final sortBoxOrderOptionValues = <SortBoxOrder, LabelBuilder>{
   SortBoxOrder.ascending: (final context) => AppLocalizations.of(context).optionsSortOrderAscending,
diff --git a/packages/neon/lib/src/utils/storage.dart b/packages/neon/neon/lib/src/utils/storage.dart
similarity index 97%
rename from packages/neon/lib/src/utils/storage.dart
rename to packages/neon/neon/lib/src/utils/storage.dart
index 5b0db5b4..06debfa1 100644
--- a/packages/neon/lib/src/utils/storage.dart
+++ b/packages/neon/neon/lib/src/utils/storage.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AppStorage extends SettingsStorage {
   AppStorage(
diff --git a/packages/neon/lib/src/utils/theme.dart b/packages/neon/neon/lib/src/utils/theme.dart
similarity index 98%
rename from packages/neon/lib/src/utils/theme.dart
rename to packages/neon/neon/lib/src/utils/theme.dart
index aa687e1c..4c498042 100644
--- a/packages/neon/lib/src/utils/theme.dart
+++ b/packages/neon/neon/lib/src/utils/theme.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 const themePrimaryColor = Color(0xFFF37736);
 
diff --git a/packages/neon/lib/src/utils/validators.dart b/packages/neon/neon/lib/src/utils/validators.dart
similarity index 96%
rename from packages/neon/lib/src/utils/validators.dart
rename to packages/neon/neon/lib/src/utils/validators.dart
index 3da20514..7d691582 100644
--- a/packages/neon/lib/src/utils/validators.dart
+++ b/packages/neon/neon/lib/src/utils/validators.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 String? validateHttpUrl(
   final BuildContext context,
diff --git a/packages/neon/lib/src/widgets/account_avatar.dart b/packages/neon/neon/lib/src/widgets/account_avatar.dart
similarity index 99%
rename from packages/neon/lib/src/widgets/account_avatar.dart
rename to packages/neon/neon/lib/src/widgets/account_avatar.dart
index ba5f5928..776d04c3 100644
--- a/packages/neon/lib/src/widgets/account_avatar.dart
+++ b/packages/neon/neon/lib/src/widgets/account_avatar.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 const kAvatarSize = 40.0;
 
diff --git a/packages/neon/lib/src/widgets/account_settings_tile.dart b/packages/neon/neon/lib/src/widgets/account_settings_tile.dart
similarity index 94%
rename from packages/neon/lib/src/widgets/account_settings_tile.dart
rename to packages/neon/neon/lib/src/widgets/account_settings_tile.dart
index 5bd3e960..adb0945e 100644
--- a/packages/neon/lib/src/widgets/account_settings_tile.dart
+++ b/packages/neon/neon/lib/src/widgets/account_settings_tile.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AccountSettingsTile extends SettingsTile {
   const AccountSettingsTile({
diff --git a/packages/neon/lib/src/widgets/account_tile.dart b/packages/neon/neon/lib/src/widgets/account_tile.dart
similarity index 98%
rename from packages/neon/lib/src/widgets/account_tile.dart
rename to packages/neon/neon/lib/src/widgets/account_tile.dart
index 9adf38a5..7a7e1453 100644
--- a/packages/neon/lib/src/widgets/account_tile.dart
+++ b/packages/neon/neon/lib/src/widgets/account_tile.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AccountTile extends StatelessWidget {
   const AccountTile({
diff --git a/packages/neon/lib/src/widgets/app_implementation_icon.dart b/packages/neon/neon/lib/src/widgets/app_implementation_icon.dart
similarity index 97%
rename from packages/neon/lib/src/widgets/app_implementation_icon.dart
rename to packages/neon/neon/lib/src/widgets/app_implementation_icon.dart
index 48712624..8063be7f 100644
--- a/packages/neon/lib/src/widgets/app_implementation_icon.dart
+++ b/packages/neon/neon/lib/src/widgets/app_implementation_icon.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class AppImplementationIcon extends StatelessWidget {
   const AppImplementationIcon({
diff --git a/packages/neon/lib/src/widgets/cached_api_image.dart b/packages/neon/neon/lib/src/widgets/cached_api_image.dart
similarity index 97%
rename from packages/neon/lib/src/widgets/cached_api_image.dart
rename to packages/neon/neon/lib/src/widgets/cached_api_image.dart
index 0350e537..ada5f4e4 100644
--- a/packages/neon/lib/src/widgets/cached_api_image.dart
+++ b/packages/neon/neon/lib/src/widgets/cached_api_image.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 typedef APIImageDownloader = Future<Uint8List> Function();
 
diff --git a/packages/neon/lib/src/widgets/cached_image.dart b/packages/neon/neon/lib/src/widgets/cached_image.dart
similarity index 98%
rename from packages/neon/lib/src/widgets/cached_image.dart
rename to packages/neon/neon/lib/src/widgets/cached_image.dart
index fb9aa07f..7a8415ef 100644
--- a/packages/neon/lib/src/widgets/cached_image.dart
+++ b/packages/neon/neon/lib/src/widgets/cached_image.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 final _cacheManager = DefaultCacheManager();
 
diff --git a/packages/neon/lib/src/widgets/cached_url_image.dart b/packages/neon/neon/lib/src/widgets/cached_url_image.dart
similarity index 92%
rename from packages/neon/lib/src/widgets/cached_url_image.dart
rename to packages/neon/neon/lib/src/widgets/cached_url_image.dart
index 4e10b2ea..eb038ef6 100644
--- a/packages/neon/lib/src/widgets/cached_url_image.dart
+++ b/packages/neon/neon/lib/src/widgets/cached_url_image.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class CachedURLImage extends CachedImage {
   CachedURLImage({
diff --git a/packages/neon/lib/src/widgets/custom_dialog.dart b/packages/neon/neon/lib/src/widgets/custom_dialog.dart
similarity index 93%
rename from packages/neon/lib/src/widgets/custom_dialog.dart
rename to packages/neon/neon/lib/src/widgets/custom_dialog.dart
index 7cbc6b84..c92a0583 100644
--- a/packages/neon/lib/src/widgets/custom_dialog.dart
+++ b/packages/neon/neon/lib/src/widgets/custom_dialog.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class CustomDialog extends StatelessWidget {
   const CustomDialog({
diff --git a/packages/neon/lib/src/widgets/custom_linear_progress_indicator.dart b/packages/neon/neon/lib/src/widgets/custom_linear_progress_indicator.dart
similarity index 96%
rename from packages/neon/lib/src/widgets/custom_linear_progress_indicator.dart
rename to packages/neon/neon/lib/src/widgets/custom_linear_progress_indicator.dart
index cf79b596..ef293692 100644
--- a/packages/neon/lib/src/widgets/custom_linear_progress_indicator.dart
+++ b/packages/neon/neon/lib/src/widgets/custom_linear_progress_indicator.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class CustomLinearProgressIndicator extends StatelessWidget {
   const CustomLinearProgressIndicator({
diff --git a/packages/neon/lib/src/widgets/custom_listview.dart b/packages/neon/neon/lib/src/widgets/custom_listview.dart
similarity index 98%
rename from packages/neon/lib/src/widgets/custom_listview.dart
rename to packages/neon/neon/lib/src/widgets/custom_listview.dart
index 09df63eb..b523e47e 100644
--- a/packages/neon/lib/src/widgets/custom_listview.dart
+++ b/packages/neon/neon/lib/src/widgets/custom_listview.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class CustomListView<T> extends StatelessWidget {
   const CustomListView({
diff --git a/packages/neon/lib/src/widgets/exception.dart b/packages/neon/neon/lib/src/widgets/exception.dart
similarity index 99%
rename from packages/neon/lib/src/widgets/exception.dart
rename to packages/neon/neon/lib/src/widgets/exception.dart
index 87cd318d..f7567f6a 100644
--- a/packages/neon/lib/src/widgets/exception.dart
+++ b/packages/neon/neon/lib/src/widgets/exception.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class ExceptionWidget extends StatelessWidget {
   const ExceptionWidget(
diff --git a/packages/neon/lib/src/widgets/image_wrapper.dart b/packages/neon/neon/lib/src/widgets/image_wrapper.dart
similarity index 96%
rename from packages/neon/lib/src/widgets/image_wrapper.dart
rename to packages/neon/neon/lib/src/widgets/image_wrapper.dart
index b0d33055..088d5b07 100644
--- a/packages/neon/lib/src/widgets/image_wrapper.dart
+++ b/packages/neon/neon/lib/src/widgets/image_wrapper.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class ImageWrapper extends StatelessWidget {
   const ImageWrapper({
diff --git a/packages/neon/lib/src/widgets/neon_logo.dart b/packages/neon/neon/lib/src/widgets/neon_logo.dart
similarity index 90%
rename from packages/neon/lib/src/widgets/neon_logo.dart
rename to packages/neon/neon/lib/src/widgets/neon_logo.dart
index ae3a7209..a2bb5e30 100644
--- a/packages/neon/lib/src/widgets/neon_logo.dart
+++ b/packages/neon/neon/lib/src/widgets/neon_logo.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class NeonLogo extends StatelessWidget {
   const NeonLogo({
@@ -13,6 +13,7 @@ class NeonLogo extends StatelessWidget {
         children: [
           SvgPicture.asset(
             'assets/logo_neon.svg',
+            package: 'neon',
             width: 100,
             height: 100,
           ),
diff --git a/packages/neon/lib/src/widgets/nextcloud_logo.dart b/packages/neon/neon/lib/src/widgets/nextcloud_logo.dart
similarity index 83%
rename from packages/neon/lib/src/widgets/nextcloud_logo.dart
rename to packages/neon/neon/lib/src/widgets/nextcloud_logo.dart
index bf456a3f..d813a8c6 100644
--- a/packages/neon/lib/src/widgets/nextcloud_logo.dart
+++ b/packages/neon/neon/lib/src/widgets/nextcloud_logo.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class NextcloudLogo extends StatelessWidget {
   const NextcloudLogo({
@@ -8,6 +8,7 @@ class NextcloudLogo extends StatelessWidget {
   @override
   Widget build(final BuildContext context) => SvgPicture.asset(
         'assets/logo_nextcloud.svg',
+        package: 'neon',
         width: 100,
         height: 100,
       );
diff --git a/packages/neon/lib/src/widgets/no_animation_page_route.dart b/packages/neon/neon/lib/src/widgets/no_animation_page_route.dart
similarity index 88%
rename from packages/neon/lib/src/widgets/no_animation_page_route.dart
rename to packages/neon/neon/lib/src/widgets/no_animation_page_route.dart
index f1f4f8c3..74f2e55a 100644
--- a/packages/neon/lib/src/widgets/no_animation_page_route.dart
+++ b/packages/neon/neon/lib/src/widgets/no_animation_page_route.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class NoAnimationPageRoute extends MaterialPageRoute {
   NoAnimationPageRoute({
diff --git a/packages/neon/lib/src/widgets/relative_time.dart b/packages/neon/neon/lib/src/widgets/relative_time.dart
similarity index 97%
rename from packages/neon/lib/src/widgets/relative_time.dart
rename to packages/neon/neon/lib/src/widgets/relative_time.dart
index f42042b8..dfb51bf6 100644
--- a/packages/neon/lib/src/widgets/relative_time.dart
+++ b/packages/neon/neon/lib/src/widgets/relative_time.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class RelativeTime extends StatelessWidget {
   const RelativeTime({
diff --git a/packages/neon/lib/src/widgets/result_builder.dart b/packages/neon/neon/lib/src/widgets/result_builder.dart
similarity index 96%
rename from packages/neon/lib/src/widgets/result_builder.dart
rename to packages/neon/neon/lib/src/widgets/result_builder.dart
index b4e83b05..cba7d52e 100644
--- a/packages/neon/lib/src/widgets/result_builder.dart
+++ b/packages/neon/neon/lib/src/widgets/result_builder.dart
@@ -1,4 +1,4 @@
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class ResultBuilder<T extends Bloc, R> extends StatelessWidget {
   const ResultBuilder({
diff --git a/packages/neon/lib/src/widgets/text_settings_tile.dart b/packages/neon/neon/lib/src/widgets/text_settings_tile.dart
similarity index 95%
rename from packages/neon/lib/src/widgets/text_settings_tile.dart
rename to packages/neon/neon/lib/src/widgets/text_settings_tile.dart
index 14a1bfb4..7e696078 100644
--- a/packages/neon/lib/src/widgets/text_settings_tile.dart
+++ b/packages/neon/neon/lib/src/widgets/text_settings_tile.dart
@@ -1,7 +1,7 @@
 // ignore_for_file: use_late_for_private_fields_and_variables
 // ^ This is a really strange false positive, it goes of at a very random place without any meaning. Hopefully fixed soon?
 
-part of '../neon.dart';
+part of '../../neon.dart';
 
 class TextSettingsTile extends SettingsTile {
   const TextSettingsTile({
diff --git a/packages/neon/neon/mono_pkg.yaml b/packages/neon/neon/mono_pkg.yaml
new file mode 100644
index 00000000..60bc3bfd
--- /dev/null
+++ b/packages/neon/neon/mono_pkg.yaml
@@ -0,0 +1,7 @@
+sdk:
+  - stable
+
+stages:
+  - all:
+      - analyze: --fatal-infos .
+      - format: --output=none --set-exit-if-changed --line-length 120 .
diff --git a/packages/neon/pubspec.yaml b/packages/neon/neon/pubspec.yaml
similarity index 74%
rename from packages/neon/pubspec.yaml
rename to packages/neon/neon/pubspec.yaml
index d6ed6ab7..69079e1b 100644
--- a/packages/neon/pubspec.yaml
+++ b/packages/neon/neon/pubspec.yaml
@@ -9,61 +9,48 @@ environment:
 dependencies:
   collection: ^1.16.0
   crypto: ^3.0.1
-  file_icons:
-    path: ../file_icons
   file_picker: ^4.6.1
   filesize: ^2.0.1
   flutter:
     sdk: flutter
   flutter_cache_manager: ^3.3.0
   flutter_file_dialog: ^2.3.0
-  flutter_html: ^3.0.0-alpha.3
   flutter_local_notifications: ^12.0.2
   flutter_localizations:
     sdk: flutter
-  flutter_markdown: ^0.6.10+2
   flutter_native_splash: ^2.2.0+1
   flutter_svg: ^1.0.3
-  html: ^0.15.0
   http: ^0.13.4
-  image_picker: ^0.8.5+3
-  intersperse: ^2.0.0
   intl: ^0.17.0
   json_annotation: ^4.7.0
   material_design_icons_flutter: ^6.0.7096
+  neon_notifications:
+    path: ../neon_notifications
   nextcloud:
-    path: ../nextcloud
-  open_file: ^3.2.1
+    path: ../../nextcloud
   package_info_plus: ^1.4.2
   path: ^1.8.1
   path_provider: ^2.0.9
   permission_handler: ^10.0.0
   provider: ^6.0.2
-  queue: ^3.1.0+1
   quick_actions: ^1.0.0
   rxdart: ^0.27.3
   settings:
-    path: ../settings
-  share_plus: ^4.0.4
+    path: ../../settings
   shared_preferences: ^2.0.12
   sort_box:
-    path: ../sort_box
+    path: ../../sort_box
   sqflite: ^2.0.2+1
   sqflite_common_ffi: ^2.1.1
   tray_manager: ^0.2.0
   unifiedpush: ^4.0.1
   url_launcher: ^6.0.18
-  wakelock: ^0.6.1+2
   webview_flutter: ^3.0.0
   window_manager: ^0.2.5
   xdg_directories: ^0.2.0+1
 
 dev_dependencies:
   build_runner: ^2.1.7
-  flutter_test:
-    sdk: flutter
-  integration_test:
-    sdk: flutter
   json_serializable: ^6.1.4
   nit_picking:
     git:
@@ -74,4 +61,3 @@ flutter:
   uses-material-design: true
   assets:
     - assets/
-    - assets/apps/
diff --git a/packages/neon/neon_files/.gitignore b/packages/neon/neon_files/.gitignore
new file mode 100644
index 00000000..7944852f
--- /dev/null
+++ b/packages/neon/neon_files/.gitignore
@@ -0,0 +1,48 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/neon/neon_files/.metadata b/packages/neon/neon_files/.metadata
new file mode 100644
index 00000000..8cef0ead
--- /dev/null
+++ b/packages/neon/neon_files/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 62bd79521d8d007524e351747471ba66696fc2d4
+  channel: stable
+
+project_type: package
diff --git a/packages/neon/neon_files/LICENSE b/packages/neon/neon_files/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/packages/neon/neon_files/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/packages/neon/neon_files/analysis_options.yaml b/packages/neon/neon_files/analysis_options.yaml
new file mode 100644
index 00000000..507852a6
--- /dev/null
+++ b/packages/neon/neon_files/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:nit_picking/flutter.yaml
\ No newline at end of file
diff --git a/packages/neon/assets/apps/files.svg b/packages/neon/neon_files/assets/app.svg
similarity index 100%
rename from packages/neon/assets/apps/files.svg
rename to packages/neon/neon_files/assets/app.svg
diff --git a/packages/neon/lib/src/apps/files/blocs/browser.dart b/packages/neon/neon_files/lib/blocs/browser.dart
similarity index 98%
rename from packages/neon/lib/src/apps/files/blocs/browser.dart
rename to packages/neon/neon_files/lib/blocs/browser.dart
index 00dce143..0f6ccc09 100644
--- a/packages/neon/lib/src/apps/files/blocs/browser.dart
+++ b/packages/neon/neon_files/lib/blocs/browser.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 abstract class FilesBrowserBlocEvents {
   void setPath(final List<String> path);
diff --git a/packages/neon/lib/src/apps/files/blocs/files.dart b/packages/neon/neon_files/lib/blocs/files.dart
similarity index 99%
rename from packages/neon/lib/src/apps/files/blocs/files.dart
rename to packages/neon/neon_files/lib/blocs/files.dart
index fc471844..3668eb6e 100644
--- a/packages/neon/lib/src/apps/files/blocs/files.dart
+++ b/packages/neon/neon_files/lib/blocs/files.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 abstract class FilesBlocEvents {
   void uploadFile(final List<String> path, final String localPath);
diff --git a/packages/neon/lib/src/apps/files/dialogs/choose_create.dart b/packages/neon/neon_files/lib/dialogs/choose_create.dart
similarity index 99%
rename from packages/neon/lib/src/apps/files/dialogs/choose_create.dart
rename to packages/neon/neon_files/lib/dialogs/choose_create.dart
index 7bb0855f..65e66564 100644
--- a/packages/neon/lib/src/apps/files/dialogs/choose_create.dart
+++ b/packages/neon/neon_files/lib/dialogs/choose_create.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilesChooseCreateDialog extends StatefulWidget {
   const FilesChooseCreateDialog({
diff --git a/packages/neon/lib/src/apps/files/dialogs/choose_folder.dart b/packages/neon/neon_files/lib/dialogs/choose_folder.dart
similarity index 98%
rename from packages/neon/lib/src/apps/files/dialogs/choose_folder.dart
rename to packages/neon/neon_files/lib/dialogs/choose_folder.dart
index 59330922..6a7f9351 100644
--- a/packages/neon/lib/src/apps/files/dialogs/choose_folder.dart
+++ b/packages/neon/neon_files/lib/dialogs/choose_folder.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilesChooseFolderDialog extends StatelessWidget {
   const FilesChooseFolderDialog({
diff --git a/packages/neon/lib/src/apps/files/dialogs/create_folder.dart b/packages/neon/neon_files/lib/dialogs/create_folder.dart
similarity index 98%
rename from packages/neon/lib/src/apps/files/dialogs/create_folder.dart
rename to packages/neon/neon_files/lib/dialogs/create_folder.dart
index e11af74e..9a745488 100644
--- a/packages/neon/lib/src/apps/files/dialogs/create_folder.dart
+++ b/packages/neon/neon_files/lib/dialogs/create_folder.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilesCreateFolderDialog extends StatefulWidget {
   const FilesCreateFolderDialog({
diff --git a/packages/neon/lib/src/apps/files/models/file_details.dart b/packages/neon/neon_files/lib/models/file_details.dart
similarity index 94%
rename from packages/neon/lib/src/apps/files/models/file_details.dart
rename to packages/neon/neon_files/lib/models/file_details.dart
index 167f3471..7e35f31c 100644
--- a/packages/neon/lib/src/apps/files/models/file_details.dart
+++ b/packages/neon/neon_files/lib/models/file_details.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FileDetails {
   FileDetails({
diff --git a/packages/neon/lib/src/apps/files/app.dart b/packages/neon/neon_files/lib/neon_files.dart
similarity index 87%
rename from packages/neon/lib/src/apps/files/app.dart
rename to packages/neon/neon_files/lib/neon_files.dart
index 5ecfcff8..f7f66d44 100644
--- a/packages/neon/lib/src/apps/files/app.dart
+++ b/packages/neon/neon_files/lib/neon_files.dart
@@ -1,4 +1,4 @@
-library files;
+library neon_files;
 
 import 'dart:async';
 import 'dart:io';
@@ -13,9 +13,7 @@ import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:intersperse/intersperse.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/neon.dart';
+import 'package:neon/neon.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:open_file/open_file.dart';
 import 'package:path/path.dart' as p;
@@ -44,9 +42,6 @@ class FilesApp extends AppImplementation<FilesBloc, FilesAppSpecificOptions> {
   @override
   String id = 'files';
 
-  @override
-  String nameFromLocalization(final AppLocalizations localizations) => localizations.filesName;
-
   @override
   FilesAppSpecificOptions buildOptions(final AppStorage storage) => FilesAppSpecificOptions(storage);
 
diff --git a/packages/neon/lib/src/apps/files/options.dart b/packages/neon/neon_files/lib/options.dart
similarity index 98%
rename from packages/neon/lib/src/apps/files/options.dart
rename to packages/neon/neon_files/lib/options.dart
index 8cd4a424..aa442e4a 100644
--- a/packages/neon/lib/src/apps/files/options.dart
+++ b/packages/neon/neon_files/lib/options.dart
@@ -1,4 +1,4 @@
-part of 'app.dart';
+part of 'neon_files.dart';
 
 class FilesAppSpecificOptions extends NextcloudAppSpecificOptions {
   FilesAppSpecificOptions(super.storage) {
diff --git a/packages/neon/lib/src/apps/files/pages/details.dart b/packages/neon/neon_files/lib/pages/details.dart
similarity index 98%
rename from packages/neon/lib/src/apps/files/pages/details.dart
rename to packages/neon/neon_files/lib/pages/details.dart
index ecc695d6..15b184a9 100644
--- a/packages/neon/lib/src/apps/files/pages/details.dart
+++ b/packages/neon/neon_files/lib/pages/details.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilesDetailsPage extends StatelessWidget {
   const FilesDetailsPage({
diff --git a/packages/neon/lib/src/apps/files/pages/main.dart b/packages/neon/neon_files/lib/pages/main.dart
similarity index 97%
rename from packages/neon/lib/src/apps/files/pages/main.dart
rename to packages/neon/neon_files/lib/pages/main.dart
index 3b66f281..272da94e 100644
--- a/packages/neon/lib/src/apps/files/pages/main.dart
+++ b/packages/neon/neon_files/lib/pages/main.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilesMainPage extends StatefulWidget {
   const FilesMainPage({
diff --git a/packages/neon/lib/src/apps/files/utils/download_task.dart b/packages/neon/neon_files/lib/utils/download_task.dart
similarity index 96%
rename from packages/neon/lib/src/apps/files/utils/download_task.dart
rename to packages/neon/neon_files/lib/utils/download_task.dart
index f4af3532..0e509f2c 100644
--- a/packages/neon/lib/src/apps/files/utils/download_task.dart
+++ b/packages/neon/neon_files/lib/utils/download_task.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class DownloadTask {
   DownloadTask({
diff --git a/packages/neon/lib/src/apps/files/utils/upload_task.dart b/packages/neon/neon_files/lib/utils/upload_task.dart
similarity index 95%
rename from packages/neon/lib/src/apps/files/utils/upload_task.dart
rename to packages/neon/neon_files/lib/utils/upload_task.dart
index 6a52f431..0c7897fc 100644
--- a/packages/neon/lib/src/apps/files/utils/upload_task.dart
+++ b/packages/neon/neon_files/lib/utils/upload_task.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class UploadTask {
   UploadTask({
diff --git a/packages/neon/lib/src/apps/files/widgets/browser_view.dart b/packages/neon/neon_files/lib/widgets/browser_view.dart
similarity index 99%
rename from packages/neon/lib/src/apps/files/widgets/browser_view.dart
rename to packages/neon/neon_files/lib/widgets/browser_view.dart
index b773cf53..e04acbd7 100644
--- a/packages/neon/lib/src/apps/files/widgets/browser_view.dart
+++ b/packages/neon/neon_files/lib/widgets/browser_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilesBrowserView extends StatefulWidget {
   const FilesBrowserView({
diff --git a/packages/neon/lib/src/apps/files/widgets/file_preview.dart b/packages/neon/neon_files/lib/widgets/file_preview.dart
similarity index 98%
rename from packages/neon/lib/src/apps/files/widgets/file_preview.dart
rename to packages/neon/neon_files/lib/widgets/file_preview.dart
index d75f0581..9d8a3300 100644
--- a/packages/neon/lib/src/apps/files/widgets/file_preview.dart
+++ b/packages/neon/neon_files/lib/widgets/file_preview.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_files.dart';
 
 class FilePreview extends StatelessWidget {
   const FilePreview({
diff --git a/packages/neon/neon_files/mono_pkg.yaml b/packages/neon/neon_files/mono_pkg.yaml
new file mode 100644
index 00000000..60bc3bfd
--- /dev/null
+++ b/packages/neon/neon_files/mono_pkg.yaml
@@ -0,0 +1,7 @@
+sdk:
+  - stable
+
+stages:
+  - all:
+      - analyze: --fatal-infos .
+      - format: --output=none --set-exit-if-changed --line-length 120 .
diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml
new file mode 100644
index 00000000..810f9172
--- /dev/null
+++ b/packages/neon/neon_files/pubspec.yaml
@@ -0,0 +1,41 @@
+name: neon_files
+version: 1.0.0
+publish_to: 'none'
+
+environment:
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.9'
+
+dependencies:
+  collection: ^1.17.0
+  file_icons:
+    path: ../../file_icons
+  file_picker: ^4.6.1
+  filesize: ^2.0.1
+  flutter:
+    sdk: flutter
+  image_picker: ^0.8.7+1
+  intersperse: ^2.0.0
+  material_design_icons_flutter: ^6.0.7096
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  open_file: ^3.2.1
+  path: ^1.8.2
+  provider: ^6.0.5
+  queue: ^3.1.0+2
+  rxdart: ^0.27.7
+  settings:
+    path: ../../settings
+
+dev_dependencies:
+  nit_picking:
+    git:
+      url: https://github.com/stack11/dart_nit_picking
+      ref: 0b2ee0d
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/
diff --git a/packages/neon/neon_news/.gitignore b/packages/neon/neon_news/.gitignore
new file mode 100644
index 00000000..7944852f
--- /dev/null
+++ b/packages/neon/neon_news/.gitignore
@@ -0,0 +1,48 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/neon/neon_news/.metadata b/packages/neon/neon_news/.metadata
new file mode 100644
index 00000000..8cef0ead
--- /dev/null
+++ b/packages/neon/neon_news/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 62bd79521d8d007524e351747471ba66696fc2d4
+  channel: stable
+
+project_type: package
diff --git a/packages/neon/neon_news/LICENSE b/packages/neon/neon_news/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/packages/neon/neon_news/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/packages/neon/neon_news/analysis_options.yaml b/packages/neon/neon_news/analysis_options.yaml
new file mode 100644
index 00000000..507852a6
--- /dev/null
+++ b/packages/neon/neon_news/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:nit_picking/flutter.yaml
\ No newline at end of file
diff --git a/packages/neon/assets/apps/news.svg b/packages/neon/neon_news/assets/app.svg
similarity index 100%
rename from packages/neon/assets/apps/news.svg
rename to packages/neon/neon_news/assets/app.svg
diff --git a/packages/neon/lib/src/apps/news/blocs/article.dart b/packages/neon/neon_news/lib/blocs/article.dart
similarity index 98%
rename from packages/neon/lib/src/apps/news/blocs/article.dart
rename to packages/neon/neon_news/lib/blocs/article.dart
index 0d1dcdd7..c20b39d9 100644
--- a/packages/neon/lib/src/apps/news/blocs/article.dart
+++ b/packages/neon/neon_news/lib/blocs/article.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 abstract class NewsArticleBlocEvents {
   void markArticleAsRead();
diff --git a/packages/neon/lib/src/apps/news/blocs/articles.dart b/packages/neon/neon_news/lib/blocs/articles.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/blocs/articles.dart
rename to packages/neon/neon_news/lib/blocs/articles.dart
index f9a7e237..4e9cac12 100644
--- a/packages/neon/lib/src/apps/news/blocs/articles.dart
+++ b/packages/neon/neon_news/lib/blocs/articles.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 enum FilterType {
   all,
diff --git a/packages/neon/lib/src/apps/news/blocs/news.dart b/packages/neon/neon_news/lib/blocs/news.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/blocs/news.dart
rename to packages/neon/neon_news/lib/blocs/news.dart
index 168282c0..d108a392 100644
--- a/packages/neon/lib/src/apps/news/blocs/news.dart
+++ b/packages/neon/neon_news/lib/blocs/news.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 abstract class NewsBlocEvents {
   void addFeed(final String url, final int? folderId);
diff --git a/packages/neon/lib/src/apps/news/dialogs/add_feed.dart b/packages/neon/neon_news/lib/dialogs/add_feed.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/dialogs/add_feed.dart
rename to packages/neon/neon_news/lib/dialogs/add_feed.dart
index 3381b5a1..a22a35a8 100644
--- a/packages/neon/lib/src/apps/news/dialogs/add_feed.dart
+++ b/packages/neon/neon_news/lib/dialogs/add_feed.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsAddFeedDialog extends StatefulWidget {
   const NewsAddFeedDialog({
diff --git a/packages/neon/lib/src/apps/news/dialogs/create_folder.dart b/packages/neon/neon_news/lib/dialogs/create_folder.dart
similarity index 98%
rename from packages/neon/lib/src/apps/news/dialogs/create_folder.dart
rename to packages/neon/neon_news/lib/dialogs/create_folder.dart
index fe110b3a..d192453d 100644
--- a/packages/neon/lib/src/apps/news/dialogs/create_folder.dart
+++ b/packages/neon/neon_news/lib/dialogs/create_folder.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsCreateFolderDialog extends StatefulWidget {
   const NewsCreateFolderDialog({
diff --git a/packages/neon/lib/src/apps/news/dialogs/feed_show_url.dart b/packages/neon/neon_news/lib/dialogs/feed_show_url.dart
similarity index 97%
rename from packages/neon/lib/src/apps/news/dialogs/feed_show_url.dart
rename to packages/neon/neon_news/lib/dialogs/feed_show_url.dart
index 3fe02ece..dc25fccf 100644
--- a/packages/neon/lib/src/apps/news/dialogs/feed_show_url.dart
+++ b/packages/neon/neon_news/lib/dialogs/feed_show_url.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFeedShowURLDialog extends StatefulWidget {
   const NewsFeedShowURLDialog({
diff --git a/packages/neon/lib/src/apps/news/dialogs/feed_update_error.dart b/packages/neon/neon_news/lib/dialogs/feed_update_error.dart
similarity index 97%
rename from packages/neon/lib/src/apps/news/dialogs/feed_update_error.dart
rename to packages/neon/neon_news/lib/dialogs/feed_update_error.dart
index b518bf4e..441467dd 100644
--- a/packages/neon/lib/src/apps/news/dialogs/feed_update_error.dart
+++ b/packages/neon/neon_news/lib/dialogs/feed_update_error.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFeedUpdateErrorDialog extends StatefulWidget {
   const NewsFeedUpdateErrorDialog({
diff --git a/packages/neon/lib/src/apps/news/dialogs/move_feed.dart b/packages/neon/neon_news/lib/dialogs/move_feed.dart
similarity index 98%
rename from packages/neon/lib/src/apps/news/dialogs/move_feed.dart
rename to packages/neon/neon_news/lib/dialogs/move_feed.dart
index 137e6aac..3edc7db8 100644
--- a/packages/neon/lib/src/apps/news/dialogs/move_feed.dart
+++ b/packages/neon/neon_news/lib/dialogs/move_feed.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsMoveFeedDialog extends StatefulWidget {
   const NewsMoveFeedDialog({
diff --git a/packages/neon/lib/src/apps/news/app.dart b/packages/neon/neon_news/lib/neon_news.dart
similarity index 89%
rename from packages/neon/lib/src/apps/news/app.dart
rename to packages/neon/neon_news/lib/neon_news.dart
index d60ebb27..23696bfa 100644
--- a/packages/neon/lib/src/apps/news/app.dart
+++ b/packages/neon/neon_news/lib/neon_news.dart
@@ -1,4 +1,4 @@
-library news;
+library neon_news;
 
 import 'dart:async';
 
@@ -8,9 +8,7 @@ import 'package:flutter_html/flutter_html.dart';
 import 'package:html/dom.dart' as html_dom;
 import 'package:html/parser.dart' as html_parser;
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/neon.dart';
+import 'package:neon/neon.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
@@ -50,9 +48,6 @@ class NewsApp extends AppImplementation<NewsBloc, NewsAppSpecificOptions> {
   @override
   String id = 'news';
 
-  @override
-  String nameFromLocalization(final AppLocalizations localizations) => localizations.newsName;
-
   @override
   NewsAppSpecificOptions buildOptions(final AppStorage storage) => NewsAppSpecificOptions(storage, platform);
 
diff --git a/packages/neon/lib/src/apps/news/options.dart b/packages/neon/neon_news/lib/options.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/options.dart
rename to packages/neon/neon_news/lib/options.dart
index c3c1766c..dacba758 100644
--- a/packages/neon/lib/src/apps/news/options.dart
+++ b/packages/neon/neon_news/lib/options.dart
@@ -1,4 +1,4 @@
-part of 'app.dart';
+part of 'neon_news.dart';
 
 class NewsAppSpecificOptions extends NextcloudAppSpecificOptions {
   NewsAppSpecificOptions(super.storage, final NeonPlatform platform) {
diff --git a/packages/neon/lib/src/apps/news/pages/article.dart b/packages/neon/neon_news/lib/pages/article.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/pages/article.dart
rename to packages/neon/neon_news/lib/pages/article.dart
index 1ffc8aed..f7d5a258 100644
--- a/packages/neon/lib/src/apps/news/pages/article.dart
+++ b/packages/neon/neon_news/lib/pages/article.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsArticlePage extends StatefulWidget {
   const NewsArticlePage({
diff --git a/packages/neon/lib/src/apps/news/pages/feed.dart b/packages/neon/neon_news/lib/pages/feed.dart
similarity index 95%
rename from packages/neon/lib/src/apps/news/pages/feed.dart
rename to packages/neon/neon_news/lib/pages/feed.dart
index 74771e91..60175a69 100644
--- a/packages/neon/lib/src/apps/news/pages/feed.dart
+++ b/packages/neon/neon_news/lib/pages/feed.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFeedPage extends StatelessWidget {
   const NewsFeedPage({
diff --git a/packages/neon/lib/src/apps/news/pages/folder.dart b/packages/neon/neon_news/lib/pages/folder.dart
similarity index 94%
rename from packages/neon/lib/src/apps/news/pages/folder.dart
rename to packages/neon/neon_news/lib/pages/folder.dart
index 68948c74..cb339845 100644
--- a/packages/neon/lib/src/apps/news/pages/folder.dart
+++ b/packages/neon/neon_news/lib/pages/folder.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFolderPage extends StatelessWidget {
   const NewsFolderPage({
diff --git a/packages/neon/lib/src/apps/news/pages/main.dart b/packages/neon/neon_news/lib/pages/main.dart
similarity index 98%
rename from packages/neon/lib/src/apps/news/pages/main.dart
rename to packages/neon/neon_news/lib/pages/main.dart
index 176434f3..b6eea45b 100644
--- a/packages/neon/lib/src/apps/news/pages/main.dart
+++ b/packages/neon/neon_news/lib/pages/main.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsMainPage extends StatefulWidget {
   const NewsMainPage({
diff --git a/packages/neon/lib/src/apps/news/sort/articles.dart b/packages/neon/neon_news/lib/sort/articles.dart
similarity index 94%
rename from packages/neon/lib/src/apps/news/sort/articles.dart
rename to packages/neon/neon_news/lib/sort/articles.dart
index fb804598..aa3d32de 100644
--- a/packages/neon/lib/src/apps/news/sort/articles.dart
+++ b/packages/neon/neon_news/lib/sort/articles.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 final articlesSortBox = SortBox<ArticlesSortProperty, NextcloudNewsArticle>(
   {
diff --git a/packages/neon/lib/src/apps/news/sort/feeds.dart b/packages/neon/neon_news/lib/sort/feeds.dart
similarity index 93%
rename from packages/neon/lib/src/apps/news/sort/feeds.dart
rename to packages/neon/neon_news/lib/sort/feeds.dart
index ba5fa744..ba255596 100644
--- a/packages/neon/lib/src/apps/news/sort/feeds.dart
+++ b/packages/neon/neon_news/lib/sort/feeds.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 final feedsSortBox = SortBox<FeedsSortProperty, NextcloudNewsFeed>(
   {
diff --git a/packages/neon/lib/src/apps/news/sort/folders.dart b/packages/neon/neon_news/lib/sort/folders.dart
similarity index 96%
rename from packages/neon/lib/src/apps/news/sort/folders.dart
rename to packages/neon/neon_news/lib/sort/folders.dart
index d7d56b08..2797a079 100644
--- a/packages/neon/lib/src/apps/news/sort/folders.dart
+++ b/packages/neon/neon_news/lib/sort/folders.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 final foldersSortBox = SortBox<FoldersSortProperty, FolderFeedsWrapper>(
   {
diff --git a/packages/neon/lib/src/apps/news/widgets/articles_view.dart b/packages/neon/neon_news/lib/widgets/articles_view.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/widgets/articles_view.dart
rename to packages/neon/neon_news/lib/widgets/articles_view.dart
index cf0f7ae8..0a8699d1 100644
--- a/packages/neon/lib/src/apps/news/widgets/articles_view.dart
+++ b/packages/neon/neon_news/lib/widgets/articles_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsArticlesView extends StatefulWidget {
   const NewsArticlesView({
diff --git a/packages/neon/lib/src/apps/news/widgets/feed_icon.dart b/packages/neon/neon_news/lib/widgets/feed_icon.dart
similarity index 96%
rename from packages/neon/lib/src/apps/news/widgets/feed_icon.dart
rename to packages/neon/neon_news/lib/widgets/feed_icon.dart
index a9af0a86..c133048a 100644
--- a/packages/neon/lib/src/apps/news/widgets/feed_icon.dart
+++ b/packages/neon/neon_news/lib/widgets/feed_icon.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFeedIcon extends StatelessWidget {
   const NewsFeedIcon({
diff --git a/packages/neon/lib/src/apps/news/widgets/feeds_view.dart b/packages/neon/neon_news/lib/widgets/feeds_view.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/widgets/feeds_view.dart
rename to packages/neon/neon_news/lib/widgets/feeds_view.dart
index 173b592c..57fa5372 100644
--- a/packages/neon/lib/src/apps/news/widgets/feeds_view.dart
+++ b/packages/neon/neon_news/lib/widgets/feeds_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFeedsView extends StatelessWidget {
   const NewsFeedsView({
diff --git a/packages/neon/lib/src/apps/news/widgets/folder_select.dart b/packages/neon/neon_news/lib/widgets/folder_select.dart
similarity index 96%
rename from packages/neon/lib/src/apps/news/widgets/folder_select.dart
rename to packages/neon/neon_news/lib/widgets/folder_select.dart
index 21312a74..471b8eb3 100644
--- a/packages/neon/lib/src/apps/news/widgets/folder_select.dart
+++ b/packages/neon/neon_news/lib/widgets/folder_select.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFolderSelect extends StatelessWidget {
   const NewsFolderSelect({
diff --git a/packages/neon/lib/src/apps/news/widgets/folder_view.dart b/packages/neon/neon_news/lib/widgets/folder_view.dart
similarity index 98%
rename from packages/neon/lib/src/apps/news/widgets/folder_view.dart
rename to packages/neon/neon_news/lib/widgets/folder_view.dart
index 6f24c0cb..bdfcd6b5 100644
--- a/packages/neon/lib/src/apps/news/widgets/folder_view.dart
+++ b/packages/neon/neon_news/lib/widgets/folder_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFolderView extends StatefulWidget {
   const NewsFolderView({
diff --git a/packages/neon/lib/src/apps/news/widgets/folders_view.dart b/packages/neon/neon_news/lib/widgets/folders_view.dart
similarity index 99%
rename from packages/neon/lib/src/apps/news/widgets/folders_view.dart
rename to packages/neon/neon_news/lib/widgets/folders_view.dart
index f2d729ef..a19ff77c 100644
--- a/packages/neon/lib/src/apps/news/widgets/folders_view.dart
+++ b/packages/neon/neon_news/lib/widgets/folders_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_news.dart';
 
 class NewsFoldersView extends StatelessWidget {
   const NewsFoldersView({
diff --git a/packages/neon/neon_news/mono_pkg.yaml b/packages/neon/neon_news/mono_pkg.yaml
new file mode 100644
index 00000000..60bc3bfd
--- /dev/null
+++ b/packages/neon/neon_news/mono_pkg.yaml
@@ -0,0 +1,7 @@
+sdk:
+  - stable
+
+stages:
+  - all:
+      - analyze: --fatal-infos .
+      - format: --output=none --set-exit-if-changed --line-length 120 .
diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml
new file mode 100644
index 00000000..9c23f721
--- /dev/null
+++ b/packages/neon/neon_news/pubspec.yaml
@@ -0,0 +1,39 @@
+name: neon_news
+version: 1.0.0
+publish_to: 'none'
+
+environment:
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.9'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  flutter_html: ^3.0.0-alpha.6
+  html: ^0.15.2
+  material_design_icons_flutter: ^6.0.7096
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  provider: ^6.0.5
+  rxdart: ^0.27.7
+  settings:
+    path: ../../settings
+  share_plus: ^4.5.3
+  sort_box:
+    path: ../../sort_box
+  url_launcher: ^6.1.10
+  wakelock: ^0.6.2
+  webview_flutter: ^3.0.4
+
+dev_dependencies:
+  nit_picking:
+    git:
+      url: https://github.com/stack11/dart_nit_picking
+      ref: 0b2ee0d
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/
diff --git a/packages/neon/neon_notes/.gitignore b/packages/neon/neon_notes/.gitignore
new file mode 100644
index 00000000..7944852f
--- /dev/null
+++ b/packages/neon/neon_notes/.gitignore
@@ -0,0 +1,48 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/neon/neon_notes/.metadata b/packages/neon/neon_notes/.metadata
new file mode 100644
index 00000000..8cef0ead
--- /dev/null
+++ b/packages/neon/neon_notes/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 62bd79521d8d007524e351747471ba66696fc2d4
+  channel: stable
+
+project_type: package
diff --git a/packages/neon/neon_notes/LICENSE b/packages/neon/neon_notes/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/packages/neon/neon_notes/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/packages/neon/neon_notes/analysis_options.yaml b/packages/neon/neon_notes/analysis_options.yaml
new file mode 100644
index 00000000..507852a6
--- /dev/null
+++ b/packages/neon/neon_notes/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:nit_picking/flutter.yaml
\ No newline at end of file
diff --git a/packages/neon/assets/apps/notes.svg b/packages/neon/neon_notes/assets/app.svg
similarity index 100%
rename from packages/neon/assets/apps/notes.svg
rename to packages/neon/neon_notes/assets/app.svg
diff --git a/packages/neon/lib/src/apps/notes/blocs/note.dart b/packages/neon/neon_notes/lib/blocs/note.dart
similarity index 98%
rename from packages/neon/lib/src/apps/notes/blocs/note.dart
rename to packages/neon/neon_notes/lib/blocs/note.dart
index 415be44f..bc206bc3 100644
--- a/packages/neon/lib/src/apps/notes/blocs/note.dart
+++ b/packages/neon/neon_notes/lib/blocs/note.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 abstract class NotesNoteBlocEvents {
   void updateContent(final String content);
diff --git a/packages/neon/lib/src/apps/notes/blocs/notes.dart b/packages/neon/neon_notes/lib/blocs/notes.dart
similarity index 98%
rename from packages/neon/lib/src/apps/notes/blocs/notes.dart
rename to packages/neon/neon_notes/lib/blocs/notes.dart
index 3674c24e..c7b0c6da 100644
--- a/packages/neon/lib/src/apps/notes/blocs/notes.dart
+++ b/packages/neon/neon_notes/lib/blocs/notes.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 abstract class NotesBlocEvents {
   void createNote({
diff --git a/packages/neon/lib/src/apps/notes/dialogs/create_note.dart b/packages/neon/neon_notes/lib/dialogs/create_note.dart
similarity index 98%
rename from packages/neon/lib/src/apps/notes/dialogs/create_note.dart
rename to packages/neon/neon_notes/lib/dialogs/create_note.dart
index aae31080..71b3bc73 100644
--- a/packages/neon/lib/src/apps/notes/dialogs/create_note.dart
+++ b/packages/neon/neon_notes/lib/dialogs/create_note.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesCreateNoteDialog extends StatefulWidget {
   const NotesCreateNoteDialog({
diff --git a/packages/neon/lib/src/apps/notes/dialogs/select_category.dart b/packages/neon/neon_notes/lib/dialogs/select_category.dart
similarity index 98%
rename from packages/neon/lib/src/apps/notes/dialogs/select_category.dart
rename to packages/neon/neon_notes/lib/dialogs/select_category.dart
index 7e259243..0bd56e13 100644
--- a/packages/neon/lib/src/apps/notes/dialogs/select_category.dart
+++ b/packages/neon/neon_notes/lib/dialogs/select_category.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesSelectCategoryDialog extends StatefulWidget {
   const NotesSelectCategoryDialog({
diff --git a/packages/neon/lib/src/apps/notes/app.dart b/packages/neon/neon_notes/lib/neon_notes.dart
similarity index 87%
rename from packages/neon/lib/src/apps/notes/app.dart
rename to packages/neon/neon_notes/lib/neon_notes.dart
index 6ba3fa6e..032356d2 100644
--- a/packages/neon/lib/src/apps/notes/app.dart
+++ b/packages/neon/neon_notes/lib/neon_notes.dart
@@ -7,9 +7,7 @@ import 'package:crypto/crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/neon.dart';
+import 'package:neon/neon.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
 import 'package:queue/queue.dart';
@@ -41,9 +39,6 @@ class NotesApp extends AppImplementation<NotesBloc, NotesAppSpecificOptions> {
   @override
   String id = 'notes';
 
-  @override
-  String nameFromLocalization(final AppLocalizations localizations) => localizations.notesName;
-
   @override
   NotesAppSpecificOptions buildOptions(final AppStorage storage) => NotesAppSpecificOptions(storage);
 
diff --git a/packages/neon/lib/src/apps/notes/options.dart b/packages/neon/neon_notes/lib/options.dart
similarity index 99%
rename from packages/neon/lib/src/apps/notes/options.dart
rename to packages/neon/neon_notes/lib/options.dart
index ee46fca6..8036d3df 100644
--- a/packages/neon/lib/src/apps/notes/options.dart
+++ b/packages/neon/neon_notes/lib/options.dart
@@ -1,4 +1,4 @@
-part of 'app.dart';
+part of 'neon_notes.dart';
 
 class NotesAppSpecificOptions extends NextcloudAppSpecificOptions {
   NotesAppSpecificOptions(super.storage) {
diff --git a/packages/neon/lib/src/apps/notes/pages/category.dart b/packages/neon/neon_notes/lib/pages/category.dart
similarity index 94%
rename from packages/neon/lib/src/apps/notes/pages/category.dart
rename to packages/neon/neon_notes/lib/pages/category.dart
index b0a305b9..5fa059c2 100644
--- a/packages/neon/lib/src/apps/notes/pages/category.dart
+++ b/packages/neon/neon_notes/lib/pages/category.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesCategoryPage extends StatelessWidget {
   const NotesCategoryPage({
diff --git a/packages/neon/lib/src/apps/notes/pages/main.dart b/packages/neon/neon_notes/lib/pages/main.dart
similarity index 97%
rename from packages/neon/lib/src/apps/notes/pages/main.dart
rename to packages/neon/neon_notes/lib/pages/main.dart
index dc62228a..43c45bc4 100644
--- a/packages/neon/lib/src/apps/notes/pages/main.dart
+++ b/packages/neon/neon_notes/lib/pages/main.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesMainPage extends StatefulWidget {
   const NotesMainPage({
diff --git a/packages/neon/lib/src/apps/notes/pages/note.dart b/packages/neon/neon_notes/lib/pages/note.dart
similarity index 99%
rename from packages/neon/lib/src/apps/notes/pages/note.dart
rename to packages/neon/neon_notes/lib/pages/note.dart
index 5993a209..e9320d8f 100644
--- a/packages/neon/lib/src/apps/notes/pages/note.dart
+++ b/packages/neon/neon_notes/lib/pages/note.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesNotePage extends StatefulWidget {
   const NotesNotePage({
diff --git a/packages/neon/lib/src/apps/notes/sort/categories.dart b/packages/neon/neon_notes/lib/sort/categories.dart
similarity index 94%
rename from packages/neon/lib/src/apps/notes/sort/categories.dart
rename to packages/neon/neon_notes/lib/sort/categories.dart
index ad5ce6db..42f461c4 100644
--- a/packages/neon/lib/src/apps/notes/sort/categories.dart
+++ b/packages/neon/neon_notes/lib/sort/categories.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 final categoriesSortBox = SortBox<CategoriesSortProperty, NoteCategory>(
   {
diff --git a/packages/neon/lib/src/apps/notes/sort/notes.dart b/packages/neon/neon_notes/lib/sort/notes.dart
similarity index 91%
rename from packages/neon/lib/src/apps/notes/sort/notes.dart
rename to packages/neon/neon_notes/lib/sort/notes.dart
index d919faae..6ac33921 100644
--- a/packages/neon/lib/src/apps/notes/sort/notes.dart
+++ b/packages/neon/neon_notes/lib/sort/notes.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 final notesSortBox = SortBox<NotesSortProperty, NextcloudNotesNote>(
   {
diff --git a/packages/neon/lib/src/apps/notes/utils/category_color.dart b/packages/neon/neon_notes/lib/utils/category_color.dart
similarity index 92%
rename from packages/neon/lib/src/apps/notes/utils/category_color.dart
rename to packages/neon/neon_notes/lib/utils/category_color.dart
index 59e4cff6..1ce2dbb1 100644
--- a/packages/neon/lib/src/apps/notes/utils/category_color.dart
+++ b/packages/neon/neon_notes/lib/utils/category_color.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesCategoryColor {
   static final Map<String, Color> _colors = {};
diff --git a/packages/neon/lib/src/apps/notes/utils/exception_handler.dart b/packages/neon/neon_notes/lib/utils/exception_handler.dart
similarity index 91%
rename from packages/neon/lib/src/apps/notes/utils/exception_handler.dart
rename to packages/neon/neon_notes/lib/utils/exception_handler.dart
index 0af8e644..22cb98c3 100644
--- a/packages/neon/lib/src/apps/notes/utils/exception_handler.dart
+++ b/packages/neon/neon_notes/lib/utils/exception_handler.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 void handleNotesException(final BuildContext context, final Object error) {
   if (error is NextcloudApiException && error.statusCode == 412) {
diff --git a/packages/neon/lib/src/apps/notes/widgets/categories_view.dart b/packages/neon/neon_notes/lib/widgets/categories_view.dart
similarity index 98%
rename from packages/neon/lib/src/apps/notes/widgets/categories_view.dart
rename to packages/neon/neon_notes/lib/widgets/categories_view.dart
index 7ac2d4d7..62076b8c 100644
--- a/packages/neon/lib/src/apps/notes/widgets/categories_view.dart
+++ b/packages/neon/neon_notes/lib/widgets/categories_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesCategoriesView extends StatelessWidget {
   const NotesCategoriesView({
diff --git a/packages/neon/lib/src/apps/notes/widgets/category_select.dart b/packages/neon/neon_notes/lib/widgets/category_select.dart
similarity index 99%
rename from packages/neon/lib/src/apps/notes/widgets/category_select.dart
rename to packages/neon/neon_notes/lib/widgets/category_select.dart
index 5a69ed92..e40c49df 100644
--- a/packages/neon/lib/src/apps/notes/widgets/category_select.dart
+++ b/packages/neon/neon_notes/lib/widgets/category_select.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesCategorySelect extends StatelessWidget {
   NotesCategorySelect({
diff --git a/packages/neon/lib/src/apps/notes/widgets/notes_view.dart b/packages/neon/neon_notes/lib/widgets/notes_view.dart
similarity index 99%
rename from packages/neon/lib/src/apps/notes/widgets/notes_view.dart
rename to packages/neon/neon_notes/lib/widgets/notes_view.dart
index a1a57ee6..8ad43126 100644
--- a/packages/neon/lib/src/apps/notes/widgets/notes_view.dart
+++ b/packages/neon/neon_notes/lib/widgets/notes_view.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notes.dart';
 
 class NotesView extends StatelessWidget {
   const NotesView({
diff --git a/packages/neon/neon_notes/mono_pkg.yaml b/packages/neon/neon_notes/mono_pkg.yaml
new file mode 100644
index 00000000..60bc3bfd
--- /dev/null
+++ b/packages/neon/neon_notes/mono_pkg.yaml
@@ -0,0 +1,7 @@
+sdk:
+  - stable
+
+stages:
+  - all:
+      - analyze: --fatal-infos .
+      - format: --output=none --set-exit-if-changed --line-length 120 .
diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml
new file mode 100644
index 00000000..0d8fe257
--- /dev/null
+++ b/packages/neon/neon_notes/pubspec.yaml
@@ -0,0 +1,38 @@
+name: neon_notes
+version: 1.0.0
+publish_to: 'none'
+
+environment:
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.9'
+
+dependencies:
+  crypto: ^3.0.2
+  flutter:
+    sdk: flutter
+  flutter_markdown: ^0.6.14
+  material_design_icons_flutter: ^6.0.7096
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  provider: ^6.0.5
+  queue: ^3.1.0+2
+  rxdart: ^0.27.7
+  settings:
+    path: ../../settings
+  sort_box:
+    path: ../../sort_box
+  url_launcher: ^6.1.10
+  wakelock: ^0.6.2
+
+dev_dependencies:
+  nit_picking:
+    git:
+      url: https://github.com/stack11/dart_nit_picking
+      ref: 0b2ee0d
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/
diff --git a/packages/neon/neon_notifications/.gitignore b/packages/neon/neon_notifications/.gitignore
new file mode 100644
index 00000000..7944852f
--- /dev/null
+++ b/packages/neon/neon_notifications/.gitignore
@@ -0,0 +1,48 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/neon/neon_notifications/.metadata b/packages/neon/neon_notifications/.metadata
new file mode 100644
index 00000000..8cef0ead
--- /dev/null
+++ b/packages/neon/neon_notifications/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 62bd79521d8d007524e351747471ba66696fc2d4
+  channel: stable
+
+project_type: package
diff --git a/packages/neon/neon_notifications/LICENSE b/packages/neon/neon_notifications/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/packages/neon/neon_notifications/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/packages/neon/neon_notifications/analysis_options.yaml b/packages/neon/neon_notifications/analysis_options.yaml
new file mode 100644
index 00000000..507852a6
--- /dev/null
+++ b/packages/neon/neon_notifications/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:nit_picking/flutter.yaml
\ No newline at end of file
diff --git a/packages/neon/assets/apps/notifications.svg b/packages/neon/neon_notifications/assets/app.svg
similarity index 100%
rename from packages/neon/assets/apps/notifications.svg
rename to packages/neon/neon_notifications/assets/app.svg
diff --git a/packages/neon/lib/src/apps/notifications/blocs/notifications.dart b/packages/neon/neon_notifications/lib/blocs/notifications.dart
similarity index 97%
rename from packages/neon/lib/src/apps/notifications/blocs/notifications.dart
rename to packages/neon/neon_notifications/lib/blocs/notifications.dart
index cb75d000..909bbf50 100644
--- a/packages/neon/lib/src/apps/notifications/blocs/notifications.dart
+++ b/packages/neon/neon_notifications/lib/blocs/notifications.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notifications.dart';
 
 abstract class NotificationsBlocEvents {
   void deleteNotification(final int id);
diff --git a/packages/neon/lib/src/apps/notifications/app.dart b/packages/neon/neon_notifications/lib/neon_notifications.dart
similarity index 82%
rename from packages/neon/lib/src/apps/notifications/app.dart
rename to packages/neon/neon_notifications/lib/neon_notifications.dart
index 87f44a05..a6ff8fa7 100644
--- a/packages/neon/lib/src/apps/notifications/app.dart
+++ b/packages/neon/neon_notifications/lib/neon_notifications.dart
@@ -4,9 +4,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/models/account.dart';
-import 'package:neon/src/neon.dart';
+import 'package:neon/neon.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
@@ -21,9 +19,6 @@ class NotificationsApp extends AppImplementation<NotificationsBloc, Notification
   @override
   String id = 'notifications';
 
-  @override
-  String nameFromLocalization(final AppLocalizations localizations) => localizations.notificationsName;
-
   @override
   NotificationsAppSpecificOptions buildOptions(final AppStorage storage) => NotificationsAppSpecificOptions(storage);
 
diff --git a/packages/neon/lib/src/apps/notifications/options.dart b/packages/neon/neon_notifications/lib/options.dart
similarity index 84%
rename from packages/neon/lib/src/apps/notifications/options.dart
rename to packages/neon/neon_notifications/lib/options.dart
index ad1b95d1..8801e95c 100644
--- a/packages/neon/lib/src/apps/notifications/options.dart
+++ b/packages/neon/neon_notifications/lib/options.dart
@@ -1,4 +1,4 @@
-part of 'app.dart';
+part of 'neon_notifications.dart';
 
 class NotificationsAppSpecificOptions extends NextcloudAppSpecificOptions {
   NotificationsAppSpecificOptions(super.storage) {
diff --git a/packages/neon/lib/src/apps/notifications/pages/main.dart b/packages/neon/neon_notifications/lib/pages/main.dart
similarity index 99%
rename from packages/neon/lib/src/apps/notifications/pages/main.dart
rename to packages/neon/neon_notifications/lib/pages/main.dart
index 820701fd..79fc5520 100644
--- a/packages/neon/lib/src/apps/notifications/pages/main.dart
+++ b/packages/neon/neon_notifications/lib/pages/main.dart
@@ -1,4 +1,4 @@
-part of '../app.dart';
+part of '../neon_notifications.dart';
 
 class NotificationsMainPage extends StatefulWidget {
   const NotificationsMainPage({
diff --git a/packages/neon/neon_notifications/mono_pkg.yaml b/packages/neon/neon_notifications/mono_pkg.yaml
new file mode 100644
index 00000000..60bc3bfd
--- /dev/null
+++ b/packages/neon/neon_notifications/mono_pkg.yaml
@@ -0,0 +1,7 @@
+sdk:
+  - stable
+
+stages:
+  - all:
+      - analyze: --fatal-infos .
+      - format: --output=none --set-exit-if-changed --line-length 120 .
diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/neon/neon_notifications/pubspec.yaml
new file mode 100644
index 00000000..285b725e
--- /dev/null
+++ b/packages/neon/neon_notifications/pubspec.yaml
@@ -0,0 +1,29 @@
+name: neon_notifications
+version: 1.0.0
+publish_to: 'none'
+
+environment:
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: '>=3.7.9'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  material_design_icons_flutter: ^6.0.7096
+  neon:
+    path: ../neon
+  nextcloud:
+    path: ../../nextcloud
+  provider: ^6.0.5
+  rxdart: ^0.27.7
+
+dev_dependencies:
+  nit_picking:
+    git:
+      url: https://github.com/stack11/dart_nit_picking
+      ref: 0b2ee0d
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/
diff --git a/tool/build-neon.sh b/tool/build-neon.sh
index 0f40fcbf..fab4806c 100755
--- a/tool/build-neon.sh
+++ b/tool/build-neon.sh
@@ -49,10 +49,10 @@ if [[ "$target" == "linux/arm64" ]] || [[ "$target" == "linux/amd64" ]]; then
     paths+=("$path/lib" "$path/pubspec.yaml")
   done
   run_args=()
-  for path in ${paths[*]} "packages/file_icons/fonts" "packages/neon/assets" "packages/neon/build" "packages/neon/linux"; do
+  for path in ${paths[*]} "packages/file_icons/fonts" packages/neon{,_files,_news,_notes,_notifications}/assets "packages/app/build" "packages/app/linux"; do
     run_args+=(-v "$(pwd)/$path:/src/$path")
   done
-  mkdir -p "packages/neon/build"
+  mkdir -p "packages/app/build"
 
   container_id="$(
     # shellcheck disable=SC2086
diff --git a/tool/build/linux.sh b/tool/build/linux.sh
index 13101b4f..2ba9e731 100755
--- a/tool/build/linux.sh
+++ b/tool/build/linux.sh
@@ -11,6 +11,6 @@ function cleanup() {
 }
 trap cleanup EXIT
 
-cd /src/packages/neon
+cd /src/packages/app
 # shellcheck disable=SC2086
 flutter build linux ${BUILD_ARGS[*]}
\ No newline at end of file
diff --git a/tool/ci.sh b/tool/ci.sh
index 04cf44d3..a2a60c76 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -68,13 +68,13 @@ for PKG in ${PKGS}; do
       echo -e "\033[1mPKG: ${PKG}; TASK: ${TASK}\033[22m"
       case ${TASK} in
       analyze_0)
-        echo 'dart analyze --fatal-infos .'
-        dart analyze --fatal-infos . || EXIT_CODE=$?
-        ;;
-      analyze_1)
         echo 'flutter analyze --fatal-infos .'
         flutter analyze --fatal-infos . || EXIT_CODE=$?
         ;;
+      analyze_1)
+        echo 'dart analyze --fatal-infos .'
+        dart analyze --fatal-infos . || EXIT_CODE=$?
+        ;;
       format)
         echo 'dart format --output=none --set-exit-if-changed --line-length 120 .'
         dart format --output=none --set-exit-if-changed --line-length 120 . || EXIT_CODE=$?
diff --git a/tool/generate-file-icons.sh b/tool/generate-file-icons.sh
new file mode 100755
index 00000000..dfa947e1
--- /dev/null
+++ b/tool/generate-file-icons.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euxo pipefail
+cd "$(dirname "$0")/.."
+
+(
+  cd packages/file_icons
+  fvm dart run
+)
diff --git a/tool/generate-neon.sh b/tool/generate-neon.sh
index b5ae6cd5..ab006379 100755
--- a/tool/generate-neon.sh
+++ b/tool/generate-neon.sh
@@ -26,7 +26,7 @@ function export_mipmap_icon_all() {
 function copy_nextcloud_app_svg() {
   id="$1"
   path="$2"
-  target="packages/neon/assets/apps/$id.svg"
+  target="packages/neon_$id/assets/app.svg"
   if [ -f "$path/img/app.svg" ]; then
     cp "$path/img/app.svg" "$target"
   elif [ -f "$path/img/$id.svg" ]; then
@@ -56,28 +56,26 @@ copy_nextcloud_app_svg notifications external/nextcloud-notifications
   wget https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/cable-data.svg -O assets/logo_neon.svg
   sed -i "s/<path /<path fill=\"$color\" /g" assets/logo_neon.svg
 
+  fvm dart run build_runner build --delete-conflicting-outputs
+  fvm flutter gen-l10n
+)
+
+(
+  cd packages/app
+
   # Splash screens
-  inkscape assets/logo_neon.svg -o assets/splash_icon.png -w 768 -h 768 # 768px at xxxhdpi is 192dp
-  convert -size 1152x1152 xc:none assets/splash_icon.png -gravity center -composite assets/splash_icon_android_12.png # 1152px at xxxhdpi is 288dp
-  exiftool -overwrite_original -all= assets/splash_icon_android_12.png # To remove timestamps
+  inkscape ../neon/assets/logo_neon.svg -o img/splash_icon.png -w 768 -h 768 # 768px at xxxhdpi is 192dp
+  convert -size 1152x1152 xc:none img/splash_icon.png -gravity center -composite img/splash_icon_android_12.png # 1152px at xxxhdpi is 288dp
+  exiftool -overwrite_original -all= img/splash_icon_android_12.png # To remove timestamps
 
   # Android launcher icons
-  export_mipmap_icon_all "assets/logo_neon.svg" "ic_launcher" &
-  export_mipmap_icon_all "assets/apps/files.svg" "app_files" &
-  export_mipmap_icon_all "assets/apps/news.svg" "app_news" &
-  export_mipmap_icon_all "assets/apps/notes.svg" "app_notes" &
-  export_mipmap_icon_all "assets/apps/notifications.svg" "app_notifications" &
+  export_mipmap_icon_all "../neon/assets/logo_neon.svg" "ic_launcher" &
+  for id in files news notes notifications; do
+    export_mipmap_icon_all "../neon_$id/assets/app.svg" "app_$id" &
+  done
   wait
 
-  fvm dart run build_runner build --delete-conflicting-outputs
   fvm dart run flutter_native_splash:create
-  fvm flutter gen-l10n
-  ../../tool/format.sh
-
-  rm assets/splash_icon.png assets/splash_icon_android_12.png
 )
 
-(
-  cd packages/file_icons
-  fvm dart run
-)
+./tool/format.sh
diff --git a/tool/generate-screenshots.sh b/tool/generate-screenshots.sh
index 16514e8e..7ef1d6c6 100755
--- a/tool/generate-screenshots.sh
+++ b/tool/generate-screenshots.sh
@@ -10,7 +10,7 @@ function cleanup() {
 trap cleanup EXIT
 
 (
-  cd packages/neon
+  cd packages/app
   fvm flutter drive \
     --driver=test_driver/integration_test.dart \
     --target=integration_test/screenshot_test.dart \