diff --git a/app/build.gradle b/app/build.gradle
index 39854dcb..4e853be4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     buildToolsVersion "28.0.3"
 
     defaultConfig {
-        applicationId "com.simplemobiletools.filemanager"
+        applicationId "com.simplemobiletools.filemanager.pro"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 62
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73cac9e2..6d65ed32 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.simplemobiletools.filemanager"
+    package="com.simplemobiletools.filemanager.pro"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/String.kt
deleted file mode 100644
index dfe597fb..00000000
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/String.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.simplemobiletools.filemanager.extensions
-
-fun String.isZipFile() = endsWith(".zip", true)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/App.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/App.kt
similarity index 86%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/App.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/App.kt
index 1565b1d8..36d2f0f6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/App.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/App.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager
+package com.simplemobiletools.filemanager.pro
 
 import android.app.Application
 import com.github.ajalt.reprint.core.Reprint
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/FavoritesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
similarity index 89%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/activities/FavoritesActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
index 3daf9a9c..8c7169a2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/FavoritesActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.activities
+package com.simplemobiletools.filemanager.pro.activities
 
 import android.graphics.Paint
 import android.os.Bundle
@@ -8,9 +8,9 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.adapters.ManageFavoritesAdapter
-import com.simplemobiletools.filemanager.extensions.config
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter
+import com.simplemobiletools.filemanager.pro.extensions.config
 import kotlinx.android.synthetic.main.activity_favorites.*
 
 class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
similarity index 95%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
index b15fd502..46fca9a1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.activities
+package com.simplemobiletools.filemanager.pro.activities
 
 import android.app.Activity
 import android.app.SearchManager
@@ -13,18 +13,17 @@ import android.view.MenuItem
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.MenuItemCompat
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
-import com.simplemobiletools.commons.dialogs.UpgradeToProDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.commons.models.Release
-import com.simplemobiletools.filemanager.BuildConfig
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.dialogs.ChangeSortingDialog
-import com.simplemobiletools.filemanager.extensions.config
-import com.simplemobiletools.filemanager.fragments.ItemsFragment
-import com.simplemobiletools.filemanager.helpers.RootHelpers
+import com.simplemobiletools.filemanager.pro.BuildConfig
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.dialogs.ChangeSortingDialog
+import com.simplemobiletools.filemanager.pro.extensions.config
+import com.simplemobiletools.filemanager.pro.fragments.ItemsFragment
+import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
 import com.stericson.RootTools.RootTools
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.items_fragment.view.*
@@ -57,11 +56,6 @@ class MainActivity : SimpleActivity() {
             checkIfRootAvailable()
             checkInvalidFavorites()
         }
-
-        if (!config.wasInitialUpgradeToProShown) {
-            UpgradeToProDialog(this)
-            config.wasInitialUpgradeToProShown = true
-        }
     }
 
     override fun onStop() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/ReadTextActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
similarity index 94%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/activities/ReadTextActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
index e1b0ef94..811ae890 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/ReadTextActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.activities
+package com.simplemobiletools.filemanager.pro.activities
 
 import android.app.SearchManager
 import android.content.Context
@@ -12,10 +12,10 @@ import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
 import com.simplemobiletools.commons.models.FileDirItem
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.dialogs.SaveAsDialog
-import com.simplemobiletools.filemanager.extensions.config
-import com.simplemobiletools.filemanager.extensions.openPath
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.dialogs.SaveAsDialog
+import com.simplemobiletools.filemanager.pro.extensions.config
+import com.simplemobiletools.filemanager.pro.extensions.openPath
 import kotlinx.android.synthetic.main.activity_read_text.*
 import java.io.File
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
similarity index 90%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
index 93653f4e..3f6c9d88 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
@@ -1,15 +1,18 @@
-package com.simplemobiletools.filemanager.activities
+package com.simplemobiletools.filemanager.pro.activities
 
 import android.content.Intent
 import android.os.Bundle
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.SecurityDialog
-import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
+import com.simplemobiletools.commons.extensions.handleHiddenFolderPasswordProtection
+import com.simplemobiletools.commons.extensions.updateTextColors
 import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT
 import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.extensions.config
-import com.simplemobiletools.filemanager.helpers.RootHelpers
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.extensions.config
+import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
 import kotlinx.android.synthetic.main.activity_settings.*
 import java.util.*
 
@@ -22,7 +25,6 @@ class SettingsActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
 
-        setupUpgradeToPro()
         setupCustomizeColors()
         setupUseEnglish()
         setupManageFavorites()
@@ -42,13 +44,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupUpgradeToPro() {
-        settings_upgrade_to_pro_holder.beGoneIf(isAProApp())
-        settings_upgrade_to_pro_holder.setOnClickListener {
-            launchUpgradeToProIntent()
-        }
-    }
-
     private fun setupCustomizeColors() {
         settings_customize_colors_holder.setOnClickListener {
             startCustomizationActivity()
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SimpleActivity.kt
similarity index 90%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SimpleActivity.kt
index 258aeb84..30231be1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SimpleActivity.kt
@@ -1,7 +1,7 @@
-package com.simplemobiletools.filemanager.activities
+package com.simplemobiletools.filemanager.pro.activities
 
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.filemanager.R
+import com.simplemobiletools.filemanager.pro.R
 
 open class SimpleActivity : BaseSimpleActivity() {
     override fun getAppIconIDs() = arrayListOf(
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SplashActivity.kt
similarity index 82%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SplashActivity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SplashActivity.kt
index 013cdeee..d27cfb33 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SplashActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.activities
+package com.simplemobiletools.filemanager.pro.activities
 
 import android.content.Intent
 import com.simplemobiletools.commons.activities.BaseSplashActivity
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
similarity index 98%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index 6c09fe34..cb691538 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.adapters
+package com.simplemobiletools.filemanager.pro.adapters
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -22,12 +22,12 @@ import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.activities.SimpleActivity
-import com.simplemobiletools.filemanager.dialogs.CompressAsDialog
-import com.simplemobiletools.filemanager.extensions.*
-import com.simplemobiletools.filemanager.helpers.*
-import com.simplemobiletools.filemanager.interfaces.ItemOperationsListener
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
+import com.simplemobiletools.filemanager.pro.dialogs.CompressAsDialog
+import com.simplemobiletools.filemanager.pro.extensions.*
+import com.simplemobiletools.filemanager.pro.helpers.*
+import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
 import com.stericson.RootTools.RootTools
 import kotlinx.android.synthetic.main.list_item.view.*
 import java.io.Closeable
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt
similarity index 94%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt
index a9a686e2..cdb8a246 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.adapters
+package com.simplemobiletools.filemanager.pro.adapters
 
 import android.view.Menu
 import android.view.View
@@ -7,8 +7,8 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
 import com.simplemobiletools.commons.views.MyRecyclerView
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.extensions.config
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.extensions.config
 import kotlinx.android.synthetic.main.item_manage_favorite.view.*
 import java.util.*
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeSortingDialog.kt
similarity index 94%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeSortingDialog.kt
index a34db848..2022c2ba 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeSortingDialog.kt
@@ -1,11 +1,11 @@
-package com.simplemobiletools.filemanager.dialogs
+package com.simplemobiletools.filemanager.pro.dialogs
 
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.helpers.*
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.extensions.config
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.extensions.config
 import kotlinx.android.synthetic.main.dialog_change_sorting.view.*
 
 class ChangeSortingDialog(val activity: BaseSimpleActivity, val path: String = "", val callback: () -> Unit) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CompressAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt
similarity index 93%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CompressAsDialog.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt
index 8f49e3b1..5076e9e6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CompressAsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt
@@ -1,12 +1,12 @@
-package com.simplemobiletools.filemanager.dialogs
+package com.simplemobiletools.filemanager.pro.dialogs
 
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.extensions.config
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.extensions.config
 import kotlinx.android.synthetic.main.dialog_compress_as.view.*
 
 class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val callback: (destination: String) -> Unit) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
similarity index 95%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
index f68f5248..8046e712 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt
@@ -1,11 +1,11 @@
-package com.simplemobiletools.filemanager.dialogs
+package com.simplemobiletools.filemanager.pro.dialogs
 
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.activities.SimpleActivity
-import com.simplemobiletools.filemanager.helpers.RootHelpers
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
+import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
 import kotlinx.android.synthetic.main.dialog_create_new.view.*
 import java.io.File
 import java.io.IOException
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt
similarity index 97%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SaveAsDialog.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt
index d931e957..97fab1b5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SaveAsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt
@@ -1,11 +1,11 @@
-package com.simplemobiletools.filemanager.dialogs
+package com.simplemobiletools.filemanager.pro.dialogs
 
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.filemanager.R
+import com.simplemobiletools.filemanager.pro.R
 import kotlinx.android.synthetic.main.dialog_save_as.view.*
 
 class SaveAsDialog(val activity: BaseSimpleActivity, var path: String, val callback: (savePath: String) -> Unit) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Activity.kt
similarity index 93%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Activity.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Activity.kt
index 6e0f0428..5c5d804c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Activity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.extensions
+package com.simplemobiletools.filemanager.pro.extensions
 
 import android.app.Activity
 import android.content.Intent
@@ -8,8 +8,8 @@ import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.isNougatPlus
-import com.simplemobiletools.filemanager.BuildConfig
-import com.simplemobiletools.filemanager.helpers.*
+import com.simplemobiletools.filemanager.pro.BuildConfig
+import com.simplemobiletools.filemanager.pro.helpers.*
 import java.io.File
 import java.util.*
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt
similarity index 77%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Context.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt
index bb6d08cd..8471588c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt
@@ -1,9 +1,9 @@
-package com.simplemobiletools.filemanager.extensions
+package com.simplemobiletools.filemanager.pro.extensions
 
 import android.content.Context
 import com.simplemobiletools.commons.extensions.hasExternalSDCard
 import com.simplemobiletools.commons.helpers.OTG_PATH
-import com.simplemobiletools.filemanager.helpers.Config
+import com.simplemobiletools.filemanager.pro.helpers.Config
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/String.kt
new file mode 100644
index 00000000..51975731
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/String.kt
@@ -0,0 +1,3 @@
+package com.simplemobiletools.filemanager.pro.extensions
+
+fun String.isZipFile() = endsWith(".zip", true)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
similarity index 93%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
index 33f2edff..ce055dc3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.fragments
+package com.simplemobiletools.filemanager.pro.fragments
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -14,17 +14,17 @@ import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.views.Breadcrumbs
 import com.simplemobiletools.commons.views.MyLinearLayoutManager
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.activities.MainActivity
-import com.simplemobiletools.filemanager.activities.SimpleActivity
-import com.simplemobiletools.filemanager.adapters.ItemsAdapter
-import com.simplemobiletools.filemanager.dialogs.CreateNewItemDialog
-import com.simplemobiletools.filemanager.extensions.config
-import com.simplemobiletools.filemanager.extensions.isPathOnRoot
-import com.simplemobiletools.filemanager.extensions.tryOpenPathIntent
-import com.simplemobiletools.filemanager.helpers.PATH
-import com.simplemobiletools.filemanager.helpers.RootHelpers
-import com.simplemobiletools.filemanager.interfaces.ItemOperationsListener
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.activities.MainActivity
+import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
+import com.simplemobiletools.filemanager.pro.adapters.ItemsAdapter
+import com.simplemobiletools.filemanager.pro.dialogs.CreateNewItemDialog
+import com.simplemobiletools.filemanager.pro.extensions.config
+import com.simplemobiletools.filemanager.pro.extensions.isPathOnRoot
+import com.simplemobiletools.filemanager.pro.extensions.tryOpenPathIntent
+import com.simplemobiletools.filemanager.pro.helpers.PATH
+import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
+import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
 import kotlinx.android.synthetic.main.items_fragment.view.*
 import java.io.File
 import java.util.HashMap
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt
similarity index 98%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt
index 1ee75252..33c22c1a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.helpers
+package com.simplemobiletools.filemanager.pro.helpers
 
 import android.content.Context
 import com.simplemobiletools.commons.extensions.getDocumentFile
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
similarity index 91%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Constants.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
index 91c5f815..c3f2fc63 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.helpers
+package com.simplemobiletools.filemanager.pro.helpers
 
 const val PATH = "path"
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/RootHelpers.kt
similarity index 98%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/RootHelpers.kt
index eb7e5852..2d1fa4a7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/RootHelpers.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/RootHelpers.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.helpers
+package com.simplemobiletools.filemanager.pro.helpers
 
 import android.app.Activity
 import com.simplemobiletools.commons.extensions.areDigitsOnly
@@ -6,8 +6,8 @@ import com.simplemobiletools.commons.extensions.showErrorToast
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
 import com.simplemobiletools.commons.models.FileDirItem
-import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.extensions.config
+import com.simplemobiletools.filemanager.pro.R
+import com.simplemobiletools.filemanager.pro.extensions.config
 import com.stericson.RootShell.execution.Command
 import com.stericson.RootTools.RootTools
 import java.io.File
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/interfaces/ItemOperationsListener.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt
similarity index 80%
rename from app/src/main/kotlin/com/simplemobiletools/filemanager/interfaces/ItemOperationsListener.kt
rename to app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt
index 74608c1c..5f248f41 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/interfaces/ItemOperationsListener.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.filemanager.interfaces
+package com.simplemobiletools.filemanager.pro.interfaces
 
 import com.simplemobiletools.commons.models.FileDirItem
 import java.util.*
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2b86ecae..29e72e03 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/fragment_holder"
-        android:name="com.simplemobiletools.filemanager.fragments.ItemsFragment"
+        android:name="com.simplemobiletools.filemanager.pro.fragments.ItemsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2e631a62..b304fa80 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -12,28 +12,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/settings_upgrade_to_pro_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_upgrade_to_pro"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/upgrade_to_pro"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_customize_colors_holder"
             android:layout_width="match_parent"