diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9e303b9c..f6ab9e10 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,20 +4,35 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/AndroidProject-RFID-Tools.iml" filepath="$PROJECT_DIR$/AndroidProject-RFID-Tools.iml" group="RFID-Tools" />
       <module fileurl="file://$PROJECT_DIR$/.idea/RFID-Tools.iml" filepath="$PROJECT_DIR$/.idea/RFID-Tools.iml" group="RFID-Tools" />
-      <module fileurl="file://$PROJECT_DIR$/app_main/app_main.iml" filepath="$PROJECT_DIR$/app_main/app_main.iml" group="RFID-Tools/app_main" />
-      <module fileurl="file://$PROJECT_DIR$/chameleon/chameleon.iml" filepath="$PROJECT_DIR$/chameleon/chameleon.iml" group="RFID-Tools/chameleon" />
-      <module fileurl="file://$PROJECT_DIR$/communication/communication.iml" filepath="$PROJECT_DIR$/communication/communication.iml" group="RFID-Tools/communication" />
-      <module fileurl="file://$PROJECT_DIR$/console/console.iml" filepath="$PROJECT_DIR$/console/console.iml" group="RFID-Tools/console" />
-      <module fileurl="file://$PROJECT_DIR$/crapto1/crapto1.iml" filepath="$PROJECT_DIR$/crapto1/crapto1.iml" group="RFID-Tools/crapto1" />
-      <module fileurl="file://$PROJECT_DIR$/io_redirect/io_redirect.iml" filepath="$PROJECT_DIR$/io_redirect/io_redirect.iml" group="RFID-Tools/io_redirect" />
-      <module fileurl="file://$PROJECT_DIR$/libnfc_pn53x/libnfc_pn53x.iml" filepath="$PROJECT_DIR$/libnfc_pn53x/libnfc_pn53x.iml" group="RFID-Tools/libnfc_pn53x" />
-      <module fileurl="file://$PROJECT_DIR$/mfkey_32_64/mfkey_32_64.iml" filepath="$PROJECT_DIR$/mfkey_32_64/mfkey_32_64.iml" group="RFID-Tools/mfkey_32_64" />
-      <module fileurl="file://$PROJECT_DIR$/mifaretag/mifaretag.iml" filepath="$PROJECT_DIR$/mifaretag/mifaretag.iml" group="RFID-Tools/mifaretag" />
-      <module fileurl="file://$PROJECT_DIR$/pm3flasher/pm3flasher.iml" filepath="$PROJECT_DIR$/pm3flasher/pm3flasher.iml" group="RFID-Tools/pm3flasher" />
-      <module fileurl="file://$PROJECT_DIR$/pm3iceman/pm3iceman.iml" filepath="$PROJECT_DIR$/pm3iceman/pm3iceman.iml" group="RFID-Tools/pm3iceman" />
-      <module fileurl="file://$PROJECT_DIR$/pm3official/pm3official.iml" filepath="$PROJECT_DIR$/pm3official/pm3official.iml" group="RFID-Tools/pm3official" />
-      <module fileurl="file://$PROJECT_DIR$/pm3rdv4rrg/pm3rdv4rrg.iml" filepath="$PROJECT_DIR$/pm3rdv4rrg/pm3rdv4rrg.iml" group="RFID-Tools/pm3rdv4rrg" />
-      <module fileurl="file://$PROJECT_DIR$/utils/utils.iml" filepath="$PROJECT_DIR$/utils/utils.iml" group="RFID-Tools/utils" />
+      <module fileurl="file://$PROJECT_DIR$/RFIDtools.iml" filepath="$PROJECT_DIR$/RFIDtools.iml" group="RFIDtools" />
+      <module fileurl="file://$PROJECT_DIR$/app_main/RFIDtools-app_main.iml" filepath="$PROJECT_DIR$/app_main/RFIDtools-app_main.iml" group="RFIDtools/app_main" />
+      <module fileurl="file://$PROJECT_DIR$/chameleon/RFIDtools-chameleon.iml" filepath="$PROJECT_DIR$/chameleon/RFIDtools-chameleon.iml" group="RFIDtools/chameleon" />
+      <module fileurl="file://$PROJECT_DIR$/communication/RFIDtools-communication.iml" filepath="$PROJECT_DIR$/communication/RFIDtools-communication.iml" group="RFIDtools/communication" />
+      <module fileurl="file://$PROJECT_DIR$/console/RFIDtools-console.iml" filepath="$PROJECT_DIR$/console/RFIDtools-console.iml" group="RFIDtools/console" />
+      <module fileurl="file://$PROJECT_DIR$/crapto1/RFIDtools-crapto1.iml" filepath="$PROJECT_DIR$/crapto1/RFIDtools-crapto1.iml" group="RFIDtools/crapto1" />
+      <module fileurl="file://$PROJECT_DIR$/io_redirect/RFIDtools-io_redirect.iml" filepath="$PROJECT_DIR$/io_redirect/RFIDtools-io_redirect.iml" group="RFIDtools/io_redirect" />
+      <module fileurl="file://$PROJECT_DIR$/libnfc_pn53x/RFIDtools-libnfc_pn53x.iml" filepath="$PROJECT_DIR$/libnfc_pn53x/RFIDtools-libnfc_pn53x.iml" group="RFIDtools/libnfc_pn53x" />
+      <module fileurl="file://$PROJECT_DIR$/mfkey_32_64/RFIDtools-mfkey_32_64.iml" filepath="$PROJECT_DIR$/mfkey_32_64/RFIDtools-mfkey_32_64.iml" group="RFIDtools/mfkey_32_64" />
+      <module fileurl="file://$PROJECT_DIR$/mifaretag/RFIDtools-mifaretag.iml" filepath="$PROJECT_DIR$/mifaretag/RFIDtools-mifaretag.iml" group="RFIDtools/mifaretag" />
+      <module fileurl="file://$PROJECT_DIR$/pm3flasher/RFIDtools-pm3flasher.iml" filepath="$PROJECT_DIR$/pm3flasher/RFIDtools-pm3flasher.iml" group="RFIDtools/pm3flasher" />
+      <module fileurl="file://$PROJECT_DIR$/pm3iceman/RFIDtools-pm3iceman.iml" filepath="$PROJECT_DIR$/pm3iceman/RFIDtools-pm3iceman.iml" group="RFIDtools/pm3iceman" />
+      <module fileurl="file://$PROJECT_DIR$/pm3official/RFIDtools-pm3official.iml" filepath="$PROJECT_DIR$/pm3official/RFIDtools-pm3official.iml" group="RFIDtools/pm3official" />
+      <module fileurl="file://$PROJECT_DIR$/pm3rdv4rrg/RFIDtools-pm3rdv4rrg.iml" filepath="$PROJECT_DIR$/pm3rdv4rrg/RFIDtools-pm3rdv4rrg.iml" group="RFIDtools/pm3rdv4rrg" />
+      <module fileurl="file://$PROJECT_DIR$/utils/RFIDtools-utils.iml" filepath="$PROJECT_DIR$/utils/RFIDtools-utils.iml" group="RFIDtools/utils" />
+      <module fileurl="file://$PROJECT_DIR$/app_main/app_main.iml" filepath="$PROJECT_DIR$/app_main/app_main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/chameleon/chameleon.iml" filepath="$PROJECT_DIR$/chameleon/chameleon.iml" />
+      <module fileurl="file://$PROJECT_DIR$/communication/communication.iml" filepath="$PROJECT_DIR$/communication/communication.iml" />
+      <module fileurl="file://$PROJECT_DIR$/console/console.iml" filepath="$PROJECT_DIR$/console/console.iml" />
+      <module fileurl="file://$PROJECT_DIR$/crapto1/crapto1.iml" filepath="$PROJECT_DIR$/crapto1/crapto1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/io_redirect/io_redirect.iml" filepath="$PROJECT_DIR$/io_redirect/io_redirect.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libnfc_pn53x/libnfc_pn53x.iml" filepath="$PROJECT_DIR$/libnfc_pn53x/libnfc_pn53x.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mfkey_32_64/mfkey_32_64.iml" filepath="$PROJECT_DIR$/mfkey_32_64/mfkey_32_64.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mifaretag/mifaretag.iml" filepath="$PROJECT_DIR$/mifaretag/mifaretag.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pm3flasher/pm3flasher.iml" filepath="$PROJECT_DIR$/pm3flasher/pm3flasher.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pm3iceman/pm3iceman.iml" filepath="$PROJECT_DIR$/pm3iceman/pm3iceman.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pm3official/pm3official.iml" filepath="$PROJECT_DIR$/pm3official/pm3official.iml" />
+      <module fileurl="file://$PROJECT_DIR$/pm3rdv4rrg/pm3rdv4rrg.iml" filepath="$PROJECT_DIR$/pm3rdv4rrg/pm3rdv4rrg.iml" />
+      <module fileurl="file://$PROJECT_DIR$/utils/utils.iml" filepath="$PROJECT_DIR$/utils/utils.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app_main/build.gradle b/app_main/build.gradle
index 8f3242ce..77f1c503 100644
--- a/app_main/build.gradle
+++ b/app_main/build.gradle
@@ -8,8 +8,8 @@ android {
         minSdkVersion 19
         targetSdkVersion 29
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        versionCode 6
-        versionName "1.3.3"
+        versionCode 13
+        versionName "1.4"
     }
     buildTypes {
         release {