diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b07d18ed5..20f98529b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,11 +46,11 @@ jobs: uses: actions/upload-artifact@v2 with: name: Debug APK - path: app/build/outputs/apk/debug/app-debug.apk + path: amethyst/build/outputs/apk/debug/app-debug.apk - name: Upload Test Results uses: actions/upload-artifact@v2 with: name: Build Reports - path: app/build/reports + path: amethyst/build/reports diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 77c10ab3f..24e124faf 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -32,7 +32,7 @@ jobs: - name: Sign AAB (Google Play) uses: r0adkll/sign-android-release@v1 with: - releaseDirectory: app/build/outputs/bundle/playRelease + releaseDirectory: amethyst/build/outputs/bundle/playRelease signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.KEY_ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -44,7 +44,7 @@ jobs: - name: Sign AAB (F-Droid) uses: r0adkll/sign-android-release@v1 with: - releaseDirectory: app/build/outputs/bundle/fdroidRelease + releaseDirectory: amethyst/build/outputs/bundle/fdroidRelease signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.KEY_ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -59,7 +59,7 @@ jobs: - name: Sign APK (Google Play) uses: r0adkll/sign-android-release@v1 with: - releaseDirectory: app/build/outputs/apk/play/release + releaseDirectory: amethyst/build/outputs/apk/play/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.KEY_ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -71,7 +71,7 @@ jobs: - name: Sign APK (F-Droid) uses: r0adkll/sign-android-release@v1 with: - releaseDirectory: app/build/outputs/apk/fdroid/release + releaseDirectory: amethyst/build/outputs/apk/fdroid/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.KEY_ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -99,7 +99,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -110,7 +110,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -121,7 +121,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -132,7 +132,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk asset_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -143,7 +143,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk asset_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -155,7 +155,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -166,7 +166,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -177,7 +177,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -188,7 +188,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned-signed.apk asset_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -199,7 +199,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned-signed.apk + asset_path: amethyst/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned-signed.apk asset_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk asset_content_type: application/zip @@ -213,7 +213,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab + asset_path: amethyst/build/outputs/bundle/playRelease/app-play-release.aab asset_name: amethyst-googleplay-${{ github.ref_name }}.aab asset_content_type: application/zip @@ -225,6 +225,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab + asset_path: amethyst/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab asset_name: amethyst-fdroid-${{ github.ref_name }}.aab asset_content_type: application/zip diff --git a/README.md b/README.md index a472ef445..74b6aa011 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ openssl base64 < | tr -d '\n' | tee some_signing_key.j - `KEY_PASSWORD` <- `` - `KEY_STORE_PASSWORD` <- `` - `SIGNING_KEY` <- the data from `` -3. Change the `versionCode` and `versionName` on `app/build.gradle` +3. Change the `versionCode` and `versionName` on `amethyst/build.gradle` 4. Commit and push. 5. Tag the commit with `v{x.x.x}` 6. Let the [Create Release GitHub Action](https://github.com/vitorpamplona/amethyst/actions/workflows/create-release.yml) build a new `aab` file. diff --git a/app/.gitignore b/amethyst/.gitignore similarity index 100% rename from app/.gitignore rename to amethyst/.gitignore diff --git a/app/build.gradle b/amethyst/build.gradle similarity index 100% rename from app/build.gradle rename to amethyst/build.gradle diff --git a/app/google-services.json b/amethyst/google-services.json similarity index 100% rename from app/google-services.json rename to amethyst/google-services.json diff --git a/app/proguard-rules.pro b/amethyst/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to amethyst/proguard-rules.pro diff --git a/app/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt b/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt similarity index 100% rename from app/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt rename to amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt diff --git a/app/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt b/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt similarity index 100% rename from app/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt rename to amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt diff --git a/app/src/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt b/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt similarity index 100% rename from app/src/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt rename to amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt diff --git a/app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt b/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt similarity index 100% rename from app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt rename to amethyst/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt diff --git a/app/src/androidTest/res/values/strings.xml b/amethyst/src/androidTest/res/values/strings.xml similarity index 100% rename from app/src/androidTest/res/values/strings.xml rename to amethyst/src/androidTest/res/values/strings.xml diff --git a/app/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt b/amethyst/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt similarity index 100% rename from app/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt rename to amethyst/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt diff --git a/app/src/fdroid/AndroidManifest.xml b/amethyst/src/fdroid/AndroidManifest.xml similarity index 100% rename from app/src/fdroid/AndroidManifest.xml rename to amethyst/src/fdroid/AndroidManifest.xml diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt similarity index 100% rename from app/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt rename to amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt similarity index 100% rename from app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt rename to amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt similarity index 100% rename from app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt rename to amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt similarity index 100% rename from app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt rename to amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt similarity index 100% rename from app/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt rename to amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt similarity index 100% rename from app/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt rename to amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt diff --git a/app/src/main/AndroidManifest.xml b/amethyst/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to amethyst/src/main/AndroidManifest.xml diff --git a/app/src/main/ic_launcher-playstore.png b/amethyst/src/main/ic_launcher-playstore.png similarity index 100% rename from app/src/main/ic_launcher-playstore.png rename to amethyst/src/main/ic_launcher-playstore.png diff --git a/app/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt similarity index 100% rename from app/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt rename to amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt diff --git a/app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt similarity index 100% rename from app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt rename to amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt diff --git a/app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt similarity index 100% rename from app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt rename to amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt diff --git a/app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt similarity index 100% rename from app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt rename to amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/User.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoCache.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/VideoViewedPositionCache.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/WssDataStreamCollector.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/WssDataStreamCollector.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/WssDataStreamCollector.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/WssDataStreamCollector.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/playback/WssStreamDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/WssStreamDataSource.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/playback/WssStreamDataSource.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/WssStreamDataSource.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlInfoItem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlInfoItem.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlInfoItem.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlInfoItem.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/AppScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/StringResourceCache.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/CrossfadeIfEnabled.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/CrossfadeIfEnabled.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/CrossfadeIfEnabled.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/CrossfadeIfEnabled.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/InformationDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/InformationDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/InformationDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/InformationDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollClosing.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollClosing.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollClosing.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollClosing.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollConsensusThreshold.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollConsensusThreshold.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollConsensusThreshold.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollConsensusThreshold.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollOption.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollOption.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollOption.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollOption.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollPrimaryDescription.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollPrimaryDescription.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollPrimaryDescription.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollPrimaryDescription.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollRecipientsField.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollRecipientsField.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollRecipientsField.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollRecipientsField.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollVoteValueRange.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollVoteValueRange.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollVoteValueRange.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollVoteValueRange.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NotifyRequestDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NotifyRequestDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NotifyRequestDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NotifyRequestDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UrlUserTagTransformation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UrlUserTagTransformation.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UrlUserTagTransformation.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UrlUserTagTransformation.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfo.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoClickableRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoClickableRow.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoClickableRow.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoClickableRow.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/BasicRelaySetupInfoModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/ByteFormatter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/ByteFormatter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/ByteFormatter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/ByteFormatter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/DMRelayListViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/LocalRelayListViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Nip65RelayListViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/PrivateOutboxRelayListViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayNameAndRemoveButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayNameAndRemoveButton.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayNameAndRemoveButton.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayNameAndRemoveButton.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayStatusRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayStatusRow.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayStatusRow.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayStatusRow.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayUrlEditField.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/SearchRelayListViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/ChannelFabColumn.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/ChannelFabColumn.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/ChannelFabColumn.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/ChannelFabColumn.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewCommunityNoteButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewCommunityNoteButton.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewCommunityNoteButton.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewCommunityNoteButton.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewImageButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewImageButton.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewImageButton.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewImageButton.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewNoteButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewNoteButton.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewNoteButton.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewNoteButton.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableBox.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableBox.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableBox.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableBox.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableEmail.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableEmail.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableEmail.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableEmail.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableNoteTag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableNoteTag.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableNoteTag.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableNoteTag.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickablePhone.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickablePhone.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickablePhone.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickablePhone.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUrl.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUrl.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUrl.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUrl.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUserTag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUserTag.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUserTag.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUserTag.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ForwardingPainter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ForwardingPainter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ForwardingPainter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ForwardingPainter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/GenericLoadable.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/GenericLoadable.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/GenericLoadable.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/GenericLoadable.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/MediaCompressor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/MediaCompressor.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/MediaCompressor.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/MediaCompressor.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SensitivityWarning.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SensitivityWarning.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/SensitivityWarning.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SensitivityWarning.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SlidingCarousel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SlidingCarousel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/SlidingCarousel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SlidingCarousel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/SplitItem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SplitItem.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/SplitItem.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/SplitItem.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/TranslationConfig.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TranslationConfig.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/TranslationConfig.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TranslationConfig.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZapRaiserRequest.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZapRaiserRequest.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZapRaiserRequest.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZapRaiserRequest.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/RenderContentAsMarkdown.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/RenderContentAsMarkdown.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/RenderContentAsMarkdown.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/RenderContentAsMarkdown.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPrivateFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPrivateFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPrivateFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPrivateFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPublicFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPublicFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPublicFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/BookmarkPublicFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/CommunityFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/CommunityFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/CommunityFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/CommunityFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DefaultFeedOrder.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DefaultFeedOrder.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DefaultFeedOrder.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DefaultFeedOrder.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverChatFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverChatFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverChatFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverChatFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverCommunityFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverCommunityFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverCommunityFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverCommunityFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverMarketplaceFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverMarketplaceFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverMarketplaceFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverMarketplaceFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverNIP89FeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverNIP89FeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverNIP89FeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverNIP89FeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DraftEventsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DraftEventsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DraftEventsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/DraftEventsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FilterByListParams.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/FilterByListParams.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FilterByListParams.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/FilterByListParams.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GeoHashFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/GeoHashFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GeoHashFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/GeoHashFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryResponseFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryResponseFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryResponseFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryResponseFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ThreadFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ThreadFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ThreadFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/ThreadFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileAppRecommendationsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileAppRecommendationsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileAppRecommendationsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileAppRecommendationsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileBookmarksFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileBookmarksFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileBookmarksFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileBookmarksFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileConversationsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileConversationsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileConversationsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileConversationsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileReportsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileReportsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileReportsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileReportsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/RepostLayout.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/RepostLayout.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/RepostLayout.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/RepostLayout.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/RouteMaker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/RouteMaker.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/RouteMaker.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/RouteMaker.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlockReportChecker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/BlockReportChecker.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlockReportChecker.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/BlockReportChecker.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChannelCardCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomHeaderCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PubKeyFormatter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PubKeyFormatter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/PubKeyFormatter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/PubKeyFormatter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/TimeAgoFormatter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateReactionTypeDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/WatchNoteEvent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/WatchNoteEvent.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/WatchNoteEvent.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/WatchNoteEvent.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapFormatter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapFormatter.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapFormatter.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapFormatter.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapUserSetCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapUserSetCompose.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapUserSetCompose.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapUserSetCompose.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForDMCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForDMCard.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForDMCard.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForDMCard.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForSearchCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForSearchCard.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForSearchCard.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddInboxRelayForSearchCard.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/BoostedMark.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/BoostedMark.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/BoostedMark.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/BoostedMark.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DefaultImageHeader.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayCommunity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayCommunity.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayCommunity.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayCommunity.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayEditStatus.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayHashtags.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayHashtags.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayHashtags.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayHashtags.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayLocation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayLocation.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayLocation.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayLocation.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayOts.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayOts.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayOts.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayOts.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayReward.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayReward.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayReward.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayReward.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayZapSplits.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayZapSplits.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayZapSplits.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayZapSplits.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DropDownMenu.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DropDownMenu.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DropDownMenu.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DropDownMenu.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ForkInfo.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ForkInfo.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ForkInfo.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ForkInfo.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/TimeAgo.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/TimeAgo.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/TimeAgo.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/TimeAgo.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ZapTheDevsCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ZapTheDevsCard.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ZapTheDevsCard.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/ZapTheDevsCard.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AudioTrack.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AudioTrack.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AudioTrack.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AudioTrack.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Badge.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Badge.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Badge.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Badge.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChannelMessage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChannelMessage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChannelMessage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChannelMessage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChatMessage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChatMessage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChatMessage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/ChatMessage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CommunityHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CommunityHeader.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CommunityHeader.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CommunityHeader.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Emoji.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileHeader.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileStorage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileStorage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileStorage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/FileStorage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Git.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivity.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivity.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivity.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivityChatMessage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivityChatMessage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivityChatMessage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LiveActivityChatMessage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LongForm.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LongForm.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LongForm.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/LongForm.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/MedicalData.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/MedicalData.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/MedicalData.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/MedicalData.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90ContentDiscoveryResponse.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90ContentDiscoveryResponse.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90ContentDiscoveryResponse.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90ContentDiscoveryResponse.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90Status.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90Status.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90Status.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/NIP90Status.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PeopleList.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PeopleList.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PeopleList.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PeopleList.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PinList.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PinList.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PinList.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PinList.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PrivateMessage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PrivateMessage.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PrivateMessage.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PrivateMessage.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Reaction.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Reaction.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Reaction.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Reaction.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RelayList.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RelayList.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RelayList.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RelayList.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RenderPostApproval.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RenderPostApproval.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RenderPostApproval.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RenderPostApproval.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Report.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Report.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Report.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Report.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Text.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Text.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Text.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Text.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Video.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/VideoDisplay.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/VideoDisplay.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/VideoDisplay.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/VideoDisplay.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Wiki.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Wiki.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Wiki.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Wiki.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeDrawer.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RememberForeverStates.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/RememberForeverStates.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RememberForeverStates.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/RememberForeverStates.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedPreferencesViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedPreferencesViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedPreferencesViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/SharedPreferencesViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/StringFeedViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedState.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedState.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedState.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt similarity index 99% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index df62b338a..b1e5c4eef 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -924,6 +924,8 @@ class AccountViewModel( userMetadata.nip05LastVerificationTime = 0 userMetadata.nip05Verified = false + Log.d("NIP05 Error", it) + onResult(userMetadata.nip05Verified) }, ) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BookmarkListScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BookmarkListScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BookmarkListScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BookmarkListScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/CommunityScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/CommunityScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/CommunityScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/CommunityScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ConnectOrbotDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ConnectOrbotDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ConnectOrbotDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ConnectOrbotDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DiscoverScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DiscoverScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DiscoverScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DiscoverScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DraftListScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DraftListScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DraftListScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/DraftListScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/LoadRedirectScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ReportNoteDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ReportNoteDialog.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ReportNoteDialog.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ReportNoteDialog.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SettingsScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginOrSignupScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginOrSignupScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginOrSignupScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginOrSignupScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt similarity index 100% rename from app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt rename to amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Type.kt diff --git a/app/src/main/res/drawable-anydpi/ic_add_photo.xml b/amethyst/src/main/res/drawable-anydpi/ic_add_photo.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_add_photo.xml rename to amethyst/src/main/res/drawable-anydpi/ic_add_photo.xml diff --git a/app/src/main/res/drawable-anydpi/ic_close.xml b/amethyst/src/main/res/drawable-anydpi/ic_close.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_close.xml rename to amethyst/src/main/res/drawable-anydpi/ic_close.xml diff --git a/app/src/main/res/drawable-anydpi/ic_key.xml b/amethyst/src/main/res/drawable-anydpi/ic_key.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_key.xml rename to amethyst/src/main/res/drawable-anydpi/ic_key.xml diff --git a/app/src/main/res/drawable-anydpi/ic_logout.xml b/amethyst/src/main/res/drawable-anydpi/ic_logout.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_logout.xml rename to amethyst/src/main/res/drawable-anydpi/ic_logout.xml diff --git a/app/src/main/res/drawable-anydpi/ic_security.xml b/amethyst/src/main/res/drawable-anydpi/ic_security.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_security.xml rename to amethyst/src/main/res/drawable-anydpi/ic_security.xml diff --git a/app/src/main/res/drawable-hdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-hdpi/ic_bookmarks.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_bookmarks.png rename to amethyst/src/main/res/drawable-hdpi/ic_bookmarks.png diff --git a/app/src/main/res/drawable-hdpi/ic_compose.png b/amethyst/src/main/res/drawable-hdpi/ic_compose.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_compose.png rename to amethyst/src/main/res/drawable-hdpi/ic_compose.png diff --git a/app/src/main/res/drawable-hdpi/ic_dm.png b/amethyst/src/main/res/drawable-hdpi/ic_dm.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_dm.png rename to amethyst/src/main/res/drawable-hdpi/ic_dm.png diff --git a/app/src/main/res/drawable-hdpi/ic_globe.png b/amethyst/src/main/res/drawable-hdpi/ic_globe.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_globe.png rename to amethyst/src/main/res/drawable-hdpi/ic_globe.png diff --git a/app/src/main/res/drawable-hdpi/ic_home.png b/amethyst/src/main/res/drawable-hdpi/ic_home.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_home.png rename to amethyst/src/main/res/drawable-hdpi/ic_home.png diff --git a/app/src/main/res/drawable-hdpi/ic_key.png b/amethyst/src/main/res/drawable-hdpi/ic_key.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_key.png rename to amethyst/src/main/res/drawable-hdpi/ic_key.png diff --git a/app/src/main/res/drawable-hdpi/ic_lists.png b/amethyst/src/main/res/drawable-hdpi/ic_lists.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_lists.png rename to amethyst/src/main/res/drawable-hdpi/ic_lists.png diff --git a/app/src/main/res/drawable-hdpi/ic_logout.png b/amethyst/src/main/res/drawable-hdpi/ic_logout.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_logout.png rename to amethyst/src/main/res/drawable-hdpi/ic_logout.png diff --git a/app/src/main/res/drawable-hdpi/ic_moments.png b/amethyst/src/main/res/drawable-hdpi/ic_moments.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_moments.png rename to amethyst/src/main/res/drawable-hdpi/ic_moments.png diff --git a/app/src/main/res/drawable-hdpi/ic_notifications.png b/amethyst/src/main/res/drawable-hdpi/ic_notifications.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_notifications.png rename to amethyst/src/main/res/drawable-hdpi/ic_notifications.png diff --git a/app/src/main/res/drawable-hdpi/ic_poll.png b/amethyst/src/main/res/drawable-hdpi/ic_poll.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_poll.png rename to amethyst/src/main/res/drawable-hdpi/ic_poll.png diff --git a/app/src/main/res/drawable-hdpi/ic_profile.png b/amethyst/src/main/res/drawable-hdpi/ic_profile.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_profile.png rename to amethyst/src/main/res/drawable-hdpi/ic_profile.png diff --git a/app/src/main/res/drawable-hdpi/ic_qrcode.png b/amethyst/src/main/res/drawable-hdpi/ic_qrcode.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_qrcode.png rename to amethyst/src/main/res/drawable-hdpi/ic_qrcode.png diff --git a/app/src/main/res/drawable-hdpi/ic_security.png b/amethyst/src/main/res/drawable-hdpi/ic_security.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_security.png rename to amethyst/src/main/res/drawable-hdpi/ic_security.png diff --git a/app/src/main/res/drawable-hdpi/ic_theme.png b/amethyst/src/main/res/drawable-hdpi/ic_theme.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_theme.png rename to amethyst/src/main/res/drawable-hdpi/ic_theme.png diff --git a/app/src/main/res/drawable-hdpi/ic_topics.png b/amethyst/src/main/res/drawable-hdpi/ic_topics.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_topics.png rename to amethyst/src/main/res/drawable-hdpi/ic_topics.png diff --git a/app/src/main/res/drawable-hdpi/ic_trends.png b/amethyst/src/main/res/drawable-hdpi/ic_trends.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_trends.png rename to amethyst/src/main/res/drawable-hdpi/ic_trends.png diff --git a/app/src/main/res/drawable-hdpi/ic_verified.png b/amethyst/src/main/res/drawable-hdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_verified.png rename to amethyst/src/main/res/drawable-hdpi/ic_verified.png diff --git a/app/src/main/res/drawable-hdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-hdpi/ic_verified_transparent.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_verified_transparent.png rename to amethyst/src/main/res/drawable-hdpi/ic_verified_transparent.png diff --git a/app/src/main/res/drawable-mdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-mdpi/ic_bookmarks.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_bookmarks.png rename to amethyst/src/main/res/drawable-mdpi/ic_bookmarks.png diff --git a/app/src/main/res/drawable-mdpi/ic_compose.png b/amethyst/src/main/res/drawable-mdpi/ic_compose.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_compose.png rename to amethyst/src/main/res/drawable-mdpi/ic_compose.png diff --git a/app/src/main/res/drawable-mdpi/ic_dm.png b/amethyst/src/main/res/drawable-mdpi/ic_dm.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_dm.png rename to amethyst/src/main/res/drawable-mdpi/ic_dm.png diff --git a/app/src/main/res/drawable-mdpi/ic_globe.png b/amethyst/src/main/res/drawable-mdpi/ic_globe.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_globe.png rename to amethyst/src/main/res/drawable-mdpi/ic_globe.png diff --git a/app/src/main/res/drawable-mdpi/ic_home.png b/amethyst/src/main/res/drawable-mdpi/ic_home.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_home.png rename to amethyst/src/main/res/drawable-mdpi/ic_home.png diff --git a/app/src/main/res/drawable-mdpi/ic_key.png b/amethyst/src/main/res/drawable-mdpi/ic_key.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_key.png rename to amethyst/src/main/res/drawable-mdpi/ic_key.png diff --git a/app/src/main/res/drawable-mdpi/ic_lists.png b/amethyst/src/main/res/drawable-mdpi/ic_lists.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_lists.png rename to amethyst/src/main/res/drawable-mdpi/ic_lists.png diff --git a/app/src/main/res/drawable-mdpi/ic_logout.png b/amethyst/src/main/res/drawable-mdpi/ic_logout.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_logout.png rename to amethyst/src/main/res/drawable-mdpi/ic_logout.png diff --git a/app/src/main/res/drawable-mdpi/ic_moments.png b/amethyst/src/main/res/drawable-mdpi/ic_moments.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_moments.png rename to amethyst/src/main/res/drawable-mdpi/ic_moments.png diff --git a/app/src/main/res/drawable-mdpi/ic_notifications.png b/amethyst/src/main/res/drawable-mdpi/ic_notifications.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_notifications.png rename to amethyst/src/main/res/drawable-mdpi/ic_notifications.png diff --git a/app/src/main/res/drawable-mdpi/ic_poll.png b/amethyst/src/main/res/drawable-mdpi/ic_poll.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_poll.png rename to amethyst/src/main/res/drawable-mdpi/ic_poll.png diff --git a/app/src/main/res/drawable-mdpi/ic_profile.png b/amethyst/src/main/res/drawable-mdpi/ic_profile.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_profile.png rename to amethyst/src/main/res/drawable-mdpi/ic_profile.png diff --git a/app/src/main/res/drawable-mdpi/ic_qrcode.png b/amethyst/src/main/res/drawable-mdpi/ic_qrcode.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_qrcode.png rename to amethyst/src/main/res/drawable-mdpi/ic_qrcode.png diff --git a/app/src/main/res/drawable-mdpi/ic_security.png b/amethyst/src/main/res/drawable-mdpi/ic_security.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_security.png rename to amethyst/src/main/res/drawable-mdpi/ic_security.png diff --git a/app/src/main/res/drawable-mdpi/ic_theme.png b/amethyst/src/main/res/drawable-mdpi/ic_theme.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_theme.png rename to amethyst/src/main/res/drawable-mdpi/ic_theme.png diff --git a/app/src/main/res/drawable-mdpi/ic_topics.png b/amethyst/src/main/res/drawable-mdpi/ic_topics.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_topics.png rename to amethyst/src/main/res/drawable-mdpi/ic_topics.png diff --git a/app/src/main/res/drawable-mdpi/ic_trends.png b/amethyst/src/main/res/drawable-mdpi/ic_trends.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_trends.png rename to amethyst/src/main/res/drawable-mdpi/ic_trends.png diff --git a/app/src/main/res/drawable-mdpi/ic_verified.png b/amethyst/src/main/res/drawable-mdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_verified.png rename to amethyst/src/main/res/drawable-mdpi/ic_verified.png diff --git a/app/src/main/res/drawable-mdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-mdpi/ic_verified_transparent.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_verified_transparent.png rename to amethyst/src/main/res/drawable-mdpi/ic_verified_transparent.png diff --git a/app/src/main/res/drawable-night-hdpi/ic_verified.png b/amethyst/src/main/res/drawable-night-hdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-night-hdpi/ic_verified.png rename to amethyst/src/main/res/drawable-night-hdpi/ic_verified.png diff --git a/app/src/main/res/drawable-night-mdpi/ic_verified.png b/amethyst/src/main/res/drawable-night-mdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-night-mdpi/ic_verified.png rename to amethyst/src/main/res/drawable-night-mdpi/ic_verified.png diff --git a/app/src/main/res/drawable-night-xhdpi/ic_verified.png b/amethyst/src/main/res/drawable-night-xhdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-night-xhdpi/ic_verified.png rename to amethyst/src/main/res/drawable-night-xhdpi/ic_verified.png diff --git a/app/src/main/res/drawable-night-xxhdpi/ic_verified.png b/amethyst/src/main/res/drawable-night-xxhdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-night-xxhdpi/ic_verified.png rename to amethyst/src/main/res/drawable-night-xxhdpi/ic_verified.png diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_verified.png b/amethyst/src/main/res/drawable-night-xxxhdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-night-xxxhdpi/ic_verified.png rename to amethyst/src/main/res/drawable-night-xxxhdpi/ic_verified.png diff --git a/app/src/main/res/drawable-night/nip_05.xml b/amethyst/src/main/res/drawable-night/nip_05.xml similarity index 100% rename from app/src/main/res/drawable-night/nip_05.xml rename to amethyst/src/main/res/drawable-night/nip_05.xml diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-xhdpi/ic_bookmarks.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_bookmarks.png rename to amethyst/src/main/res/drawable-xhdpi/ic_bookmarks.png diff --git a/app/src/main/res/drawable-xhdpi/ic_compose.png b/amethyst/src/main/res/drawable-xhdpi/ic_compose.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_compose.png rename to amethyst/src/main/res/drawable-xhdpi/ic_compose.png diff --git a/app/src/main/res/drawable-xhdpi/ic_dm.png b/amethyst/src/main/res/drawable-xhdpi/ic_dm.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_dm.png rename to amethyst/src/main/res/drawable-xhdpi/ic_dm.png diff --git a/app/src/main/res/drawable-xhdpi/ic_globe.png b/amethyst/src/main/res/drawable-xhdpi/ic_globe.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_globe.png rename to amethyst/src/main/res/drawable-xhdpi/ic_globe.png diff --git a/app/src/main/res/drawable-xhdpi/ic_home.png b/amethyst/src/main/res/drawable-xhdpi/ic_home.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_home.png rename to amethyst/src/main/res/drawable-xhdpi/ic_home.png diff --git a/app/src/main/res/drawable-xhdpi/ic_key.png b/amethyst/src/main/res/drawable-xhdpi/ic_key.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_key.png rename to amethyst/src/main/res/drawable-xhdpi/ic_key.png diff --git a/app/src/main/res/drawable-xhdpi/ic_lists.png b/amethyst/src/main/res/drawable-xhdpi/ic_lists.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_lists.png rename to amethyst/src/main/res/drawable-xhdpi/ic_lists.png diff --git a/app/src/main/res/drawable-xhdpi/ic_logout.png b/amethyst/src/main/res/drawable-xhdpi/ic_logout.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_logout.png rename to amethyst/src/main/res/drawable-xhdpi/ic_logout.png diff --git a/app/src/main/res/drawable-xhdpi/ic_moments.png b/amethyst/src/main/res/drawable-xhdpi/ic_moments.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_moments.png rename to amethyst/src/main/res/drawable-xhdpi/ic_moments.png diff --git a/app/src/main/res/drawable-xhdpi/ic_notifications.png b/amethyst/src/main/res/drawable-xhdpi/ic_notifications.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_notifications.png rename to amethyst/src/main/res/drawable-xhdpi/ic_notifications.png diff --git a/app/src/main/res/drawable-xhdpi/ic_poll.png b/amethyst/src/main/res/drawable-xhdpi/ic_poll.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_poll.png rename to amethyst/src/main/res/drawable-xhdpi/ic_poll.png diff --git a/app/src/main/res/drawable-xhdpi/ic_profile.png b/amethyst/src/main/res/drawable-xhdpi/ic_profile.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_profile.png rename to amethyst/src/main/res/drawable-xhdpi/ic_profile.png diff --git a/app/src/main/res/drawable-xhdpi/ic_qrcode.png b/amethyst/src/main/res/drawable-xhdpi/ic_qrcode.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_qrcode.png rename to amethyst/src/main/res/drawable-xhdpi/ic_qrcode.png diff --git a/app/src/main/res/drawable-xhdpi/ic_security.png b/amethyst/src/main/res/drawable-xhdpi/ic_security.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_security.png rename to amethyst/src/main/res/drawable-xhdpi/ic_security.png diff --git a/app/src/main/res/drawable-xhdpi/ic_theme.png b/amethyst/src/main/res/drawable-xhdpi/ic_theme.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_theme.png rename to amethyst/src/main/res/drawable-xhdpi/ic_theme.png diff --git a/app/src/main/res/drawable-xhdpi/ic_topics.png b/amethyst/src/main/res/drawable-xhdpi/ic_topics.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_topics.png rename to amethyst/src/main/res/drawable-xhdpi/ic_topics.png diff --git a/app/src/main/res/drawable-xhdpi/ic_trends.png b/amethyst/src/main/res/drawable-xhdpi/ic_trends.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_trends.png rename to amethyst/src/main/res/drawable-xhdpi/ic_trends.png diff --git a/app/src/main/res/drawable-xhdpi/ic_verified.png b/amethyst/src/main/res/drawable-xhdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_verified.png rename to amethyst/src/main/res/drawable-xhdpi/ic_verified.png diff --git a/app/src/main/res/drawable-xhdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-xhdpi/ic_verified_transparent.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_verified_transparent.png rename to amethyst/src/main/res/drawable-xhdpi/ic_verified_transparent.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-xxhdpi/ic_bookmarks.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_bookmarks.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_bookmarks.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_compose.png b/amethyst/src/main/res/drawable-xxhdpi/ic_compose.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_compose.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_compose.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_dm.png b/amethyst/src/main/res/drawable-xxhdpi/ic_dm.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_dm.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_dm.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_globe.png b/amethyst/src/main/res/drawable-xxhdpi/ic_globe.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_globe.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_globe.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_home.png b/amethyst/src/main/res/drawable-xxhdpi/ic_home.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_home.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_home.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_key.png b/amethyst/src/main/res/drawable-xxhdpi/ic_key.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_key.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_key.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_lists.png b/amethyst/src/main/res/drawable-xxhdpi/ic_lists.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_lists.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_lists.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_logout.png b/amethyst/src/main/res/drawable-xxhdpi/ic_logout.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_logout.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_logout.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_moments.png b/amethyst/src/main/res/drawable-xxhdpi/ic_moments.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_moments.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_moments.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications.png b/amethyst/src/main/res/drawable-xxhdpi/ic_notifications.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_notifications.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_notifications.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_poll.png b/amethyst/src/main/res/drawable-xxhdpi/ic_poll.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_poll.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_poll.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_profile.png b/amethyst/src/main/res/drawable-xxhdpi/ic_profile.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_profile.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_profile.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_qrcode.png b/amethyst/src/main/res/drawable-xxhdpi/ic_qrcode.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_qrcode.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_qrcode.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_security.png b/amethyst/src/main/res/drawable-xxhdpi/ic_security.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_security.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_security.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_theme.png b/amethyst/src/main/res/drawable-xxhdpi/ic_theme.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_theme.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_theme.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_topics.png b/amethyst/src/main/res/drawable-xxhdpi/ic_topics.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_topics.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_topics.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_trends.png b/amethyst/src/main/res/drawable-xxhdpi/ic_trends.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_trends.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_trends.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_verified.png b/amethyst/src/main/res/drawable-xxhdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_verified.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_verified.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-xxhdpi/ic_verified_transparent.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_verified_transparent.png rename to amethyst/src/main/res/drawable-xxhdpi/ic_verified_transparent.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_bookmarks.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_bookmarks.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_bookmarks.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_compose.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_compose.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_compose.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_compose.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_dm.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_dm.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_dm.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_dm.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_globe.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_globe.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_globe.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_globe.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_home.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_home.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_home.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lists.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_lists.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_lists.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_lists.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_moments.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_moments.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_moments.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_moments.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notifications.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_notifications.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_notifications.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_notifications.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_poll.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_poll.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_poll.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_poll.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_profile.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_profile.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_profile.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_profile.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_qrcode.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_qrcode.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_qrcode.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_qrcode.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_theme.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_theme.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_theme.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_theme.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_topics.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_topics.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_topics.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_topics.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_trends.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_trends.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_trends.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_trends.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_verified.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_verified.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_verified.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_verified.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png rename to amethyst/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png diff --git a/app/src/main/res/drawable-xxxhdpi/profile_banner.jpeg b/amethyst/src/main/res/drawable-xxxhdpi/profile_banner.jpeg similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/profile_banner.jpeg rename to amethyst/src/main/res/drawable-xxxhdpi/profile_banner.jpeg diff --git a/app/src/main/res/drawable/alby.xml b/amethyst/src/main/res/drawable/alby.xml similarity index 100% rename from app/src/main/res/drawable/alby.xml rename to amethyst/src/main/res/drawable/alby.xml diff --git a/app/src/main/res/drawable/amethyst.xml b/amethyst/src/main/res/drawable/amethyst.xml similarity index 100% rename from app/src/main/res/drawable/amethyst.xml rename to amethyst/src/main/res/drawable/amethyst.xml diff --git a/app/src/main/res/drawable/amethyst_monochrome.xml b/amethyst/src/main/res/drawable/amethyst_monochrome.xml similarity index 100% rename from app/src/main/res/drawable/amethyst_monochrome.xml rename to amethyst/src/main/res/drawable/amethyst_monochrome.xml diff --git a/app/src/main/res/drawable/following.xml b/amethyst/src/main/res/drawable/following.xml similarity index 100% rename from app/src/main/res/drawable/following.xml rename to amethyst/src/main/res/drawable/following.xml diff --git a/app/src/main/res/drawable/github.xml b/amethyst/src/main/res/drawable/github.xml similarity index 100% rename from app/src/main/res/drawable/github.xml rename to amethyst/src/main/res/drawable/github.xml diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/amethyst/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_foreground.xml rename to amethyst/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/app/src/main/res/drawable/ic_sensors.xml b/amethyst/src/main/res/drawable/ic_sensors.xml similarity index 100% rename from app/src/main/res/drawable/ic_sensors.xml rename to amethyst/src/main/res/drawable/ic_sensors.xml diff --git a/app/src/main/res/drawable/ic_settings.xml b/amethyst/src/main/res/drawable/ic_settings.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings.xml rename to amethyst/src/main/res/drawable/ic_settings.xml diff --git a/app/src/main/res/drawable/ic_tor.xml b/amethyst/src/main/res/drawable/ic_tor.xml similarity index 100% rename from app/src/main/res/drawable/ic_tor.xml rename to amethyst/src/main/res/drawable/ic_tor.xml diff --git a/app/src/main/res/drawable/ic_video.xml b/amethyst/src/main/res/drawable/ic_video.xml similarity index 100% rename from app/src/main/res/drawable/ic_video.xml rename to amethyst/src/main/res/drawable/ic_video.xml diff --git a/app/src/main/res/drawable/incognito.xml b/amethyst/src/main/res/drawable/incognito.xml similarity index 100% rename from app/src/main/res/drawable/incognito.xml rename to amethyst/src/main/res/drawable/incognito.xml diff --git a/app/src/main/res/drawable/incognito_off.xml b/amethyst/src/main/res/drawable/incognito_off.xml similarity index 100% rename from app/src/main/res/drawable/incognito_off.xml rename to amethyst/src/main/res/drawable/incognito_off.xml diff --git a/app/src/main/res/drawable/lyrics_off.xml b/amethyst/src/main/res/drawable/lyrics_off.xml similarity index 100% rename from app/src/main/res/drawable/lyrics_off.xml rename to amethyst/src/main/res/drawable/lyrics_off.xml diff --git a/app/src/main/res/drawable/lyrics_on.xml b/amethyst/src/main/res/drawable/lyrics_on.xml similarity index 100% rename from app/src/main/res/drawable/lyrics_on.xml rename to amethyst/src/main/res/drawable/lyrics_on.xml diff --git a/app/src/main/res/drawable/manage_accounts.xml b/amethyst/src/main/res/drawable/manage_accounts.xml similarity index 100% rename from app/src/main/res/drawable/manage_accounts.xml rename to amethyst/src/main/res/drawable/manage_accounts.xml diff --git a/app/src/main/res/drawable/mastodon.xml b/amethyst/src/main/res/drawable/mastodon.xml similarity index 100% rename from app/src/main/res/drawable/mastodon.xml rename to amethyst/src/main/res/drawable/mastodon.xml diff --git a/app/src/main/res/drawable/nip_05.xml b/amethyst/src/main/res/drawable/nip_05.xml similarity index 100% rename from app/src/main/res/drawable/nip_05.xml rename to amethyst/src/main/res/drawable/nip_05.xml diff --git a/app/src/main/res/drawable/nip_05_full.xml b/amethyst/src/main/res/drawable/nip_05_full.xml similarity index 100% rename from app/src/main/res/drawable/nip_05_full.xml rename to amethyst/src/main/res/drawable/nip_05_full.xml diff --git a/app/src/main/res/drawable/original.xml b/amethyst/src/main/res/drawable/original.xml similarity index 100% rename from app/src/main/res/drawable/original.xml rename to amethyst/src/main/res/drawable/original.xml diff --git a/app/src/main/res/drawable/relays.xml b/amethyst/src/main/res/drawable/relays.xml similarity index 100% rename from app/src/main/res/drawable/relays.xml rename to amethyst/src/main/res/drawable/relays.xml diff --git a/app/src/main/res/drawable/telegram.xml b/amethyst/src/main/res/drawable/telegram.xml similarity index 100% rename from app/src/main/res/drawable/telegram.xml rename to amethyst/src/main/res/drawable/telegram.xml diff --git a/app/src/main/res/drawable/text_select_move_forward_character.xml b/amethyst/src/main/res/drawable/text_select_move_forward_character.xml similarity index 100% rename from app/src/main/res/drawable/text_select_move_forward_character.xml rename to amethyst/src/main/res/drawable/text_select_move_forward_character.xml diff --git a/app/src/main/res/drawable/twitter.xml b/amethyst/src/main/res/drawable/twitter.xml similarity index 100% rename from app/src/main/res/drawable/twitter.xml rename to amethyst/src/main/res/drawable/twitter.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/amethyst/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to amethyst/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/amethyst/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to amethyst/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/amethyst/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.png rename to amethyst/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/amethyst/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to amethyst/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/amethyst/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to amethyst/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-hdpi/mutiny.png b/amethyst/src/main/res/mipmap-hdpi/mutiny.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/mutiny.png rename to amethyst/src/main/res/mipmap-hdpi/mutiny.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/amethyst/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.png rename to amethyst/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/amethyst/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to amethyst/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/amethyst/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to amethyst/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/mutiny.png b/amethyst/src/main/res/mipmap-mdpi/mutiny.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/mutiny.png rename to amethyst/src/main/res/mipmap-mdpi/mutiny.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/amethyst/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to amethyst/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/amethyst/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to amethyst/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/amethyst/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to amethyst/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/mutiny.png b/amethyst/src/main/res/mipmap-xhdpi/mutiny.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/mutiny.png rename to amethyst/src/main/res/mipmap-xhdpi/mutiny.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/amethyst/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to amethyst/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/amethyst/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to amethyst/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/amethyst/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to amethyst/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/mutiny.png b/amethyst/src/main/res/mipmap-xxhdpi/mutiny.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/mutiny.png rename to amethyst/src/main/res/mipmap-xxhdpi/mutiny.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/amethyst/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to amethyst/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/amethyst/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to amethyst/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/amethyst/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to amethyst/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/mutiny.png b/amethyst/src/main/res/mipmap-xxxhdpi/mutiny.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/mutiny.png rename to amethyst/src/main/res/mipmap-xxxhdpi/mutiny.png diff --git a/app/src/main/res/values-ar/strings.xml b/amethyst/src/main/res/values-ar/strings.xml similarity index 100% rename from app/src/main/res/values-ar/strings.xml rename to amethyst/src/main/res/values-ar/strings.xml diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/amethyst/src/main/res/values-bn-rBD/strings.xml similarity index 100% rename from app/src/main/res/values-bn-rBD/strings.xml rename to amethyst/src/main/res/values-bn-rBD/strings.xml diff --git a/app/src/main/res/values-cs/strings.xml b/amethyst/src/main/res/values-cs/strings.xml similarity index 100% rename from app/src/main/res/values-cs/strings.xml rename to amethyst/src/main/res/values-cs/strings.xml diff --git a/app/src/main/res/values-cy-rGB/strings.xml b/amethyst/src/main/res/values-cy-rGB/strings.xml similarity index 100% rename from app/src/main/res/values-cy-rGB/strings.xml rename to amethyst/src/main/res/values-cy-rGB/strings.xml diff --git a/app/src/main/res/values-da-rDK/strings.xml b/amethyst/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from app/src/main/res/values-da-rDK/strings.xml rename to amethyst/src/main/res/values-da-rDK/strings.xml diff --git a/app/src/main/res/values-de/strings.xml b/amethyst/src/main/res/values-de/strings.xml similarity index 100% rename from app/src/main/res/values-de/strings.xml rename to amethyst/src/main/res/values-de/strings.xml diff --git a/app/src/main/res/values-el-rGR/strings.xml b/amethyst/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from app/src/main/res/values-el-rGR/strings.xml rename to amethyst/src/main/res/values-el-rGR/strings.xml diff --git a/app/src/main/res/values-en-rGB/strings.xml b/amethyst/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from app/src/main/res/values-en-rGB/strings.xml rename to amethyst/src/main/res/values-en-rGB/strings.xml diff --git a/app/src/main/res/values-eo/strings.xml b/amethyst/src/main/res/values-eo/strings.xml similarity index 100% rename from app/src/main/res/values-eo/strings.xml rename to amethyst/src/main/res/values-eo/strings.xml diff --git a/app/src/main/res/values-es-rES/strings.xml b/amethyst/src/main/res/values-es-rES/strings.xml similarity index 100% rename from app/src/main/res/values-es-rES/strings.xml rename to amethyst/src/main/res/values-es-rES/strings.xml diff --git a/app/src/main/res/values-es-rMX/strings.xml b/amethyst/src/main/res/values-es-rMX/strings.xml similarity index 100% rename from app/src/main/res/values-es-rMX/strings.xml rename to amethyst/src/main/res/values-es-rMX/strings.xml diff --git a/app/src/main/res/values-es-rUS/strings.xml b/amethyst/src/main/res/values-es-rUS/strings.xml similarity index 100% rename from app/src/main/res/values-es-rUS/strings.xml rename to amethyst/src/main/res/values-es-rUS/strings.xml diff --git a/app/src/main/res/values-es/strings.xml b/amethyst/src/main/res/values-es/strings.xml similarity index 100% rename from app/src/main/res/values-es/strings.xml rename to amethyst/src/main/res/values-es/strings.xml diff --git a/app/src/main/res/values-et-rEE/strings.xml b/amethyst/src/main/res/values-et-rEE/strings.xml similarity index 100% rename from app/src/main/res/values-et-rEE/strings.xml rename to amethyst/src/main/res/values-et-rEE/strings.xml diff --git a/app/src/main/res/values-fa/strings.xml b/amethyst/src/main/res/values-fa/strings.xml similarity index 100% rename from app/src/main/res/values-fa/strings.xml rename to amethyst/src/main/res/values-fa/strings.xml diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/amethyst/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from app/src/main/res/values-fi-rFI/strings.xml rename to amethyst/src/main/res/values-fi-rFI/strings.xml diff --git a/app/src/main/res/values-fo-rFO/strings.xml b/amethyst/src/main/res/values-fo-rFO/strings.xml similarity index 100% rename from app/src/main/res/values-fo-rFO/strings.xml rename to amethyst/src/main/res/values-fo-rFO/strings.xml diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/amethyst/src/main/res/values-fr-rCA/strings.xml similarity index 100% rename from app/src/main/res/values-fr-rCA/strings.xml rename to amethyst/src/main/res/values-fr-rCA/strings.xml diff --git a/app/src/main/res/values-fr/strings.xml b/amethyst/src/main/res/values-fr/strings.xml similarity index 100% rename from app/src/main/res/values-fr/strings.xml rename to amethyst/src/main/res/values-fr/strings.xml diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/amethyst/src/main/res/values-gu-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-gu-rIN/strings.xml rename to amethyst/src/main/res/values-gu-rIN/strings.xml diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/amethyst/src/main/res/values-hi-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-hi-rIN/strings.xml rename to amethyst/src/main/res/values-hi-rIN/strings.xml diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/amethyst/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from app/src/main/res/values-hr-rHR/strings.xml rename to amethyst/src/main/res/values-hr-rHR/strings.xml diff --git a/app/src/main/res/values-hu/strings.xml b/amethyst/src/main/res/values-hu/strings.xml similarity index 100% rename from app/src/main/res/values-hu/strings.xml rename to amethyst/src/main/res/values-hu/strings.xml diff --git a/app/src/main/res/values-in-rID/strings.xml b/amethyst/src/main/res/values-in-rID/strings.xml similarity index 100% rename from app/src/main/res/values-in-rID/strings.xml rename to amethyst/src/main/res/values-in-rID/strings.xml diff --git a/app/src/main/res/values-in/strings.xml b/amethyst/src/main/res/values-in/strings.xml similarity index 100% rename from app/src/main/res/values-in/strings.xml rename to amethyst/src/main/res/values-in/strings.xml diff --git a/app/src/main/res/values-it-rIT/strings.xml b/amethyst/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from app/src/main/res/values-it-rIT/strings.xml rename to amethyst/src/main/res/values-it-rIT/strings.xml diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/amethyst/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from app/src/main/res/values-iw-rIL/strings.xml rename to amethyst/src/main/res/values-iw-rIL/strings.xml diff --git a/app/src/main/res/values-ja/strings.xml b/amethyst/src/main/res/values-ja/strings.xml similarity index 100% rename from app/src/main/res/values-ja/strings.xml rename to amethyst/src/main/res/values-ja/strings.xml diff --git a/app/src/main/res/values-kk-rKZ/strings.xml b/amethyst/src/main/res/values-kk-rKZ/strings.xml similarity index 100% rename from app/src/main/res/values-kk-rKZ/strings.xml rename to amethyst/src/main/res/values-kk-rKZ/strings.xml diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/amethyst/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from app/src/main/res/values-ko-rKR/strings.xml rename to amethyst/src/main/res/values-ko-rKR/strings.xml diff --git a/app/src/main/res/values-ks-rIN/strings.xml b/amethyst/src/main/res/values-ks-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-ks-rIN/strings.xml rename to amethyst/src/main/res/values-ks-rIN/strings.xml diff --git a/app/src/main/res/values-ku-rTR/strings.xml b/amethyst/src/main/res/values-ku-rTR/strings.xml similarity index 100% rename from app/src/main/res/values-ku-rTR/strings.xml rename to amethyst/src/main/res/values-ku-rTR/strings.xml diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/amethyst/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from app/src/main/res/values-lt-rLT/strings.xml rename to amethyst/src/main/res/values-lt-rLT/strings.xml diff --git a/app/src/main/res/values-ne-rNP/strings.xml b/amethyst/src/main/res/values-ne-rNP/strings.xml similarity index 100% rename from app/src/main/res/values-ne-rNP/strings.xml rename to amethyst/src/main/res/values-ne-rNP/strings.xml diff --git a/app/src/main/res/values-night/themes.xml b/amethyst/src/main/res/values-night/themes.xml similarity index 100% rename from app/src/main/res/values-night/themes.xml rename to amethyst/src/main/res/values-night/themes.xml diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/amethyst/src/main/res/values-nl-rBE/strings.xml similarity index 100% rename from app/src/main/res/values-nl-rBE/strings.xml rename to amethyst/src/main/res/values-nl-rBE/strings.xml diff --git a/app/src/main/res/values-nl/strings.xml b/amethyst/src/main/res/values-nl/strings.xml similarity index 100% rename from app/src/main/res/values-nl/strings.xml rename to amethyst/src/main/res/values-nl/strings.xml diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/amethyst/src/main/res/values-pcm-rNG/strings.xml similarity index 100% rename from app/src/main/res/values-pcm-rNG/strings.xml rename to amethyst/src/main/res/values-pcm-rNG/strings.xml diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/amethyst/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from app/src/main/res/values-pl-rPL/strings.xml rename to amethyst/src/main/res/values-pl-rPL/strings.xml diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/amethyst/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/strings.xml rename to amethyst/src/main/res/values-pt-rBR/strings.xml diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/amethyst/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from app/src/main/res/values-pt-rPT/strings.xml rename to amethyst/src/main/res/values-pt-rPT/strings.xml diff --git a/app/src/main/res/values-ru-rUA/strings.xml b/amethyst/src/main/res/values-ru-rUA/strings.xml similarity index 100% rename from app/src/main/res/values-ru-rUA/strings.xml rename to amethyst/src/main/res/values-ru-rUA/strings.xml diff --git a/app/src/main/res/values-ru/strings.xml b/amethyst/src/main/res/values-ru/strings.xml similarity index 100% rename from app/src/main/res/values-ru/strings.xml rename to amethyst/src/main/res/values-ru/strings.xml diff --git a/app/src/main/res/values-sa-rIN/strings.xml b/amethyst/src/main/res/values-sa-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-sa-rIN/strings.xml rename to amethyst/src/main/res/values-sa-rIN/strings.xml diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/amethyst/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from app/src/main/res/values-sl-rSI/strings.xml rename to amethyst/src/main/res/values-sl-rSI/strings.xml diff --git a/app/src/main/res/values-so-rSO/strings.xml b/amethyst/src/main/res/values-so-rSO/strings.xml similarity index 100% rename from app/src/main/res/values-so-rSO/strings.xml rename to amethyst/src/main/res/values-so-rSO/strings.xml diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/amethyst/src/main/res/values-sr-rSP/strings.xml similarity index 100% rename from app/src/main/res/values-sr-rSP/strings.xml rename to amethyst/src/main/res/values-sr-rSP/strings.xml diff --git a/app/src/main/res/values-ss-rZA/strings.xml b/amethyst/src/main/res/values-ss-rZA/strings.xml similarity index 100% rename from app/src/main/res/values-ss-rZA/strings.xml rename to amethyst/src/main/res/values-ss-rZA/strings.xml diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/amethyst/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from app/src/main/res/values-sv-rSE/strings.xml rename to amethyst/src/main/res/values-sv-rSE/strings.xml diff --git a/app/src/main/res/values-sw-rKE/strings.xml b/amethyst/src/main/res/values-sw-rKE/strings.xml similarity index 100% rename from app/src/main/res/values-sw-rKE/strings.xml rename to amethyst/src/main/res/values-sw-rKE/strings.xml diff --git a/app/src/main/res/values-sw-rTZ/strings.xml b/amethyst/src/main/res/values-sw-rTZ/strings.xml similarity index 100% rename from app/src/main/res/values-sw-rTZ/strings.xml rename to amethyst/src/main/res/values-sw-rTZ/strings.xml diff --git a/app/src/main/res/values-ta/strings.xml b/amethyst/src/main/res/values-ta/strings.xml similarity index 100% rename from app/src/main/res/values-ta/strings.xml rename to amethyst/src/main/res/values-ta/strings.xml diff --git a/app/src/main/res/values-th/strings.xml b/amethyst/src/main/res/values-th/strings.xml similarity index 100% rename from app/src/main/res/values-th/strings.xml rename to amethyst/src/main/res/values-th/strings.xml diff --git a/app/src/main/res/values-tr/strings.xml b/amethyst/src/main/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr/strings.xml rename to amethyst/src/main/res/values-tr/strings.xml diff --git a/app/src/main/res/values-uk/strings.xml b/amethyst/src/main/res/values-uk/strings.xml similarity index 100% rename from app/src/main/res/values-uk/strings.xml rename to amethyst/src/main/res/values-uk/strings.xml diff --git a/app/src/main/res/values-ur-rIN/strings.xml b/amethyst/src/main/res/values-ur-rIN/strings.xml similarity index 100% rename from app/src/main/res/values-ur-rIN/strings.xml rename to amethyst/src/main/res/values-ur-rIN/strings.xml diff --git a/app/src/main/res/values-uz-rUZ/strings.xml b/amethyst/src/main/res/values-uz-rUZ/strings.xml similarity index 100% rename from app/src/main/res/values-uz-rUZ/strings.xml rename to amethyst/src/main/res/values-uz-rUZ/strings.xml diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/amethyst/src/main/res/values-vi-rVN/strings.xml similarity index 100% rename from app/src/main/res/values-vi-rVN/strings.xml rename to amethyst/src/main/res/values-vi-rVN/strings.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/amethyst/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to amethyst/src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/amethyst/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rHK/strings.xml rename to amethyst/src/main/res/values-zh-rHK/strings.xml diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/amethyst/src/main/res/values-zh-rSG/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rSG/strings.xml rename to amethyst/src/main/res/values-zh-rSG/strings.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/amethyst/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/strings.xml rename to amethyst/src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values-zh/strings.xml b/amethyst/src/main/res/values-zh/strings.xml similarity index 100% rename from app/src/main/res/values-zh/strings.xml rename to amethyst/src/main/res/values-zh/strings.xml diff --git a/app/src/main/res/values/colors.xml b/amethyst/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to amethyst/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/ic_launcher_background.xml b/amethyst/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from app/src/main/res/values/ic_launcher_background.xml rename to amethyst/src/main/res/values/ic_launcher_background.xml diff --git a/app/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to amethyst/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/themes.xml b/amethyst/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to amethyst/src/main/res/values/themes.xml diff --git a/app/src/main/res/xml/backup_rules.xml b/amethyst/src/main/res/xml/backup_rules.xml similarity index 100% rename from app/src/main/res/xml/backup_rules.xml rename to amethyst/src/main/res/xml/backup_rules.xml diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/amethyst/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from app/src/main/res/xml/data_extraction_rules.xml rename to amethyst/src/main/res/xml/data_extraction_rules.xml diff --git a/app/src/main/res/xml/locales_config.xml b/amethyst/src/main/res/xml/locales_config.xml similarity index 100% rename from app/src/main/res/xml/locales_config.xml rename to amethyst/src/main/res/xml/locales_config.xml diff --git a/app/src/play/AndroidManifest.xml b/amethyst/src/play/AndroidManifest.xml similarity index 100% rename from app/src/play/AndroidManifest.xml rename to amethyst/src/play/AndroidManifest.xml diff --git a/app/src/play/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt similarity index 100% rename from app/src/play/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt rename to amethyst/src/play/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt diff --git a/app/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt similarity index 100% rename from app/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt rename to amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt diff --git a/app/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt similarity index 100% rename from app/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt rename to amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt diff --git a/app/src/play/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt similarity index 100% rename from app/src/play/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt rename to amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt diff --git a/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt similarity index 100% rename from app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt rename to amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt diff --git a/app/src/test/java/android/util/Log.java b/amethyst/src/test/java/android/util/Log.java similarity index 100% rename from app/src/test/java/android/util/Log.java rename to amethyst/src/test/java/android/util/Log.java diff --git a/app/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt similarity index 100% rename from app/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt rename to amethyst/src/test/java/com/vitorpamplona/amethyst/CharsetTest.kt diff --git a/app/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt similarity index 100% rename from app/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt rename to amethyst/src/test/java/com/vitorpamplona/amethyst/NewMessageTaggerKeyParseTest.kt diff --git a/app/src/test/java/com/vitorpamplona/amethyst/SplitterTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/SplitterTest.kt similarity index 100% rename from app/src/test/java/com/vitorpamplona/amethyst/SplitterTest.kt rename to amethyst/src/test/java/com/vitorpamplona/amethyst/SplitterTest.kt diff --git a/app/src/test/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifierTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifierTest.kt similarity index 100% rename from app/src/test/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifierTest.kt rename to amethyst/src/test/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifierTest.kt diff --git a/app/src/test/java/com/vitorpamplona/amethyst/service/Nip96Test.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/Nip96Test.kt similarity index 100% rename from app/src/test/java/com/vitorpamplona/amethyst/service/Nip96Test.kt rename to amethyst/src/test/java/com/vitorpamplona/amethyst/service/Nip96Test.kt diff --git a/app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt similarity index 100% rename from app/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt rename to amethyst/src/test/java/com/vitorpamplona/amethyst/service/zaps/UserZapsTest.kt diff --git a/build.gradle b/build.gradle index 121417ec7..e59be5f63 100644 --- a/build.gradle +++ b/build.gradle @@ -60,4 +60,4 @@ tasks.register('installGitHook', Copy) { into { new File(rootProject.rootDir, '.git/hooks') } fileMode 0777 } -tasks.getByPath(':app:preBuild').dependsOn installGitHook \ No newline at end of file +tasks.getByPath(':amethyst:preBuild').dependsOn installGitHook \ No newline at end of file diff --git a/crowdin.yml b/crowdin.yml index c822c312a..0ac256fc3 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -5,8 +5,8 @@ "preserve_hierarchy": true files: - - source: app/src/main/res/values/strings.xml - translation: app/src/main/res/values-%android_code%/%original_file_name% + - source: amethyst/src/main/res/values/strings.xml + translation: amethyst/src/main/res/values-%android_code%/%original_file_name% type: android skip_untranslated_strings: true languages_mapping: diff --git a/settings.gradle b/settings.gradle index 5c054bd44..03c0ea0b2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,7 +28,7 @@ dependencyResolutionManagement { } rootProject.name = "Amethyst" -include ':app' +include ':amethyst' include ':benchmark' include ':quartz' include ':commons'