diff --git a/app/src/Generic/fastlane/metadata/android/de-DE/short_description.txt b/app/src/generic/fastlane/metadata/android/de-DE/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/de-DE/short_description.txt
rename to app/src/generic/fastlane/metadata/android/de-DE/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/de-DE/title.txt b/app/src/generic/fastlane/metadata/android/de-DE/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/de-DE/title.txt
rename to app/src/generic/fastlane/metadata/android/de-DE/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/full_description.txt b/app/src/generic/fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/full_description.txt
rename to app/src/generic/fastlane/metadata/android/en-US/full_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/call_screenshot.png b/app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/call_screenshot.png
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/call_screenshot.png
rename to app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/call_screenshot.png
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_screenshot.png b/app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_screenshot.png
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_screenshot.png
rename to app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_screenshot.png
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_search_screenshot.png b/app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_search_screenshot.png
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_search_screenshot.png
rename to app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/calls_search_screenshot.png
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/contacts_screenshot.png b/app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/contacts_screenshot.png
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/contacts_screenshot.png
rename to app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/contacts_screenshot.png
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/server_entry_screenshot.png b/app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/server_entry_screenshot.png
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/server_entry_screenshot.png
rename to app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/server_entry_screenshot.png
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/settings_screenshot.png b/app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/settings_screenshot.png
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/phoneScreenshots/settings_screenshot.png
rename to app/src/generic/fastlane/metadata/android/en-US/phoneScreenshots/settings_screenshot.png
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/short_description.txt b/app/src/generic/fastlane/metadata/android/en-US/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/short_description.txt
rename to app/src/generic/fastlane/metadata/android/en-US/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/en-US/title.txt b/app/src/generic/fastlane/metadata/android/en-US/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/en-US/title.txt
rename to app/src/generic/fastlane/metadata/android/en-US/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/es-ES/full_description.txt b/app/src/generic/fastlane/metadata/android/es-ES/full_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/es-ES/full_description.txt
rename to app/src/generic/fastlane/metadata/android/es-ES/full_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/es-ES/short_description.txt b/app/src/generic/fastlane/metadata/android/es-ES/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/es-ES/short_description.txt
rename to app/src/generic/fastlane/metadata/android/es-ES/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/es-ES/title.txt b/app/src/generic/fastlane/metadata/android/es-ES/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/es-ES/title.txt
rename to app/src/generic/fastlane/metadata/android/es-ES/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/fr-FR/full_description.txt b/app/src/generic/fastlane/metadata/android/fr-FR/full_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/fr-FR/full_description.txt
rename to app/src/generic/fastlane/metadata/android/fr-FR/full_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/fr-FR/short_description.txt b/app/src/generic/fastlane/metadata/android/fr-FR/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/fr-FR/short_description.txt
rename to app/src/generic/fastlane/metadata/android/fr-FR/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/fr-FR/title.txt b/app/src/generic/fastlane/metadata/android/fr-FR/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/fr-FR/title.txt
rename to app/src/generic/fastlane/metadata/android/fr-FR/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/it-IT/short_description.txt b/app/src/generic/fastlane/metadata/android/it-IT/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/it-IT/short_description.txt
rename to app/src/generic/fastlane/metadata/android/it-IT/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/it-IT/title.txt b/app/src/generic/fastlane/metadata/android/it-IT/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/it-IT/title.txt
rename to app/src/generic/fastlane/metadata/android/it-IT/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/pt-BR/full_description.txt b/app/src/generic/fastlane/metadata/android/pt-BR/full_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/pt-BR/full_description.txt
rename to app/src/generic/fastlane/metadata/android/pt-BR/full_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/pt-BR/short_description.txt b/app/src/generic/fastlane/metadata/android/pt-BR/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/pt-BR/short_description.txt
rename to app/src/generic/fastlane/metadata/android/pt-BR/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/pt-BR/title.txt b/app/src/generic/fastlane/metadata/android/pt-BR/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/pt-BR/title.txt
rename to app/src/generic/fastlane/metadata/android/pt-BR/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/sr-SR/short_description.txt b/app/src/generic/fastlane/metadata/android/sr-SR/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/sr-SR/short_description.txt
rename to app/src/generic/fastlane/metadata/android/sr-SR/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/sr-SR/title.txt b/app/src/generic/fastlane/metadata/android/sr-SR/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/sr-SR/title.txt
rename to app/src/generic/fastlane/metadata/android/sr-SR/title.txt
diff --git a/app/src/Generic/fastlane/metadata/android/tr-TR/short_description.txt b/app/src/generic/fastlane/metadata/android/tr-TR/short_description.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/tr-TR/short_description.txt
rename to app/src/generic/fastlane/metadata/android/tr-TR/short_description.txt
diff --git a/app/src/Generic/fastlane/metadata/android/tr-TR/title.txt b/app/src/generic/fastlane/metadata/android/tr-TR/title.txt
similarity index 100%
rename from app/src/Generic/fastlane/metadata/android/tr-TR/title.txt
rename to app/src/generic/fastlane/metadata/android/tr-TR/title.txt
diff --git a/app/src/Generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java b/app/src/generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java
similarity index 100%
rename from app/src/Generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java
rename to app/src/generic/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java
diff --git a/app/src/GPlay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml
similarity index 100%
rename from app/src/GPlay/AndroidManifest.xml
rename to app/src/gplay/AndroidManifest.xml
diff --git a/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java
similarity index 100%
rename from app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java
rename to app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseInstanceIDService.java
diff --git a/app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java
similarity index 100%
rename from app/src/GPlay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java
rename to app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.java
diff --git a/app/src/GPlay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java b/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java
similarity index 100%
rename from app/src/GPlay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java
rename to app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.java