diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 10b9d311..909c6f10 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,4 +1,4 @@
--keep class com.simplemobiletools.notes.pro.models.* {
+-keep class org.fossify.notes.models.* {
     <fields>;
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 67cc4ec4..8f3913b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
         android:required="false" />
 
     <queries>
-        <package android:name="com.simplemobiletools.notes.debug" />
-        <package android:name="com.simplemobiletools.notes" />
+        <package android:name="org.fossify.notes.debug" />
+        <package android:name="org.fossify.notes" />
     </queries>
 
     <application
@@ -66,14 +66,14 @@
         </activity>
 
         <activity
-            android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:name="org.fossify.commons.activities.AboutActivity"
             android:configChanges="orientation"
             android:exported="false"
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity" />
 
         <activity
-            android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            android:name="org.fossify.commons.activities.CustomizationActivity"
             android:configChanges="orientation"
             android:exported="false"
             android:label="@string/customize_colors"
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SimpleActivity.kt
deleted file mode 100644
index 3c11eae2..00000000
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SimpleActivity.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.simplemobiletools.notes.pro.activities
-
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.notes.pro.R
-
-open class SimpleActivity : BaseSimpleActivity() {
-    override fun getAppIconIDs() = arrayListOf(
-            R.mipmap.ic_launcher_red,
-            R.mipmap.ic_launcher_pink,
-            R.mipmap.ic_launcher_purple,
-            R.mipmap.ic_launcher_deep_purple,
-            R.mipmap.ic_launcher_indigo,
-            R.mipmap.ic_launcher_blue,
-            R.mipmap.ic_launcher_light_blue,
-            R.mipmap.ic_launcher_cyan,
-            R.mipmap.ic_launcher_teal,
-            R.mipmap.ic_launcher_green,
-            R.mipmap.ic_launcher_light_green,
-            R.mipmap.ic_launcher_lime,
-            R.mipmap.ic_launcher_yellow,
-            R.mipmap.ic_launcher_amber,
-            R.mipmap.ic_launcher,
-            R.mipmap.ic_launcher_deep_orange,
-            R.mipmap.ic_launcher_brown,
-            R.mipmap.ic_launcher_blue_grey,
-            R.mipmap.ic_launcher_grey_black
-    )
-
-    override fun getAppLauncherName() = getString(R.string.app_launcher_name)
-}
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DateTimePatternInfoDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DateTimePatternInfoDialog.kt
deleted file mode 100644
index f7a86538..00000000
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DateTimePatternInfoDialog.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.simplemobiletools.notes.pro.dialogs
-
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
-import com.simplemobiletools.commons.extensions.setupDialogStuff
-import com.simplemobiletools.notes.pro.R
-
-class DateTimePatternInfoDialog(activity: BaseSimpleActivity) {
-
-    init {
-        val view = activity.layoutInflater.inflate(R.layout.datetime_pattern_info_layout, null)
-        activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> { } }
-            .apply {
-                activity.setupDialogStuff(view, this)
-            }
-    }
-}
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportNotesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportNotesDialog.kt
deleted file mode 100644
index a9909696..00000000
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportNotesDialog.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.simplemobiletools.notes.pro.dialogs
-
-import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogExportNotesBinding
-
-class ExportNotesDialog(val activity: SimpleActivity, callback: (filename: String) -> Unit) {
-
-    init {
-        val binding = DialogExportNotesBinding.inflate(activity.layoutInflater).apply {
-            exportNotesFilename.setText(
-                buildString {
-                    append(root.context.getString(com.simplemobiletools.commons.R.string.notes))
-                    append("_")
-                    append(root.context.getCurrentFormattedDateTime())
-                }
-            )
-        }
-
-        activity.getAlertDialogBuilder().setPositiveButton(com.simplemobiletools.commons.R.string.ok, null).setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null).apply {
-            activity.setupDialogStuff(binding.root, this, R.string.export_notes) { alertDialog ->
-                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
-
-                    val filename = binding.exportNotesFilename.value
-                    when {
-                        filename.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
-                        filename.isAValidFilename() -> {
-                            callback(filename)
-                            alertDialog.dismiss()
-                        }
-
-                        else -> activity.toast(com.simplemobiletools.commons.R.string.invalid_name)
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/App.kt b/app/src/main/kotlin/org/fossify/notes/App.kt
similarity index 59%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/App.kt
rename to app/src/main/kotlin/org/fossify/notes/App.kt
index 5885e823..399b539b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/App.kt
+++ b/app/src/main/kotlin/org/fossify/notes/App.kt
@@ -1,7 +1,7 @@
-package com.simplemobiletools.notes.pro
+package org.fossify.notes
 
 import android.app.Application
-import com.simplemobiletools.commons.extensions.checkUseEnglish
+import org.fossify.commons.extensions.checkUseEnglish
 
 class App : Application() {
     override fun onCreate() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
similarity index 91%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
rename to app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
index 77414759..3823af0d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.activities
+package org.fossify.notes.activities
 
 import android.accounts.NetworkErrorException
 import android.annotation.SuppressLint
@@ -28,28 +28,28 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.viewpager.widget.ViewPager
-import com.simplemobiletools.commons.dialogs.*
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.*
-import com.simplemobiletools.commons.models.FAQItem
-import com.simplemobiletools.commons.models.FileDirItem
-import com.simplemobiletools.commons.models.RadioItem
-import com.simplemobiletools.commons.models.Release
-import com.simplemobiletools.commons.views.MyEditText
-import com.simplemobiletools.notes.pro.BuildConfig
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.adapters.NotesPagerAdapter
-import com.simplemobiletools.notes.pro.databases.NotesDatabase
-import com.simplemobiletools.notes.pro.databinding.ActivityMainBinding
-import com.simplemobiletools.notes.pro.dialogs.*
-import com.simplemobiletools.notes.pro.extensions.*
-import com.simplemobiletools.notes.pro.fragments.TextFragment
-import com.simplemobiletools.notes.pro.helpers.*
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.dialogs.*
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.*
+import org.fossify.commons.models.FAQItem
+import org.fossify.commons.models.FileDirItem
+import org.fossify.commons.models.RadioItem
+import org.fossify.commons.models.Release
+import org.fossify.commons.views.MyEditText
+import org.fossify.notes.BuildConfig
+import org.fossify.notes.R
+import org.fossify.notes.adapters.NotesPagerAdapter
+import org.fossify.notes.databases.NotesDatabase
+import org.fossify.notes.databinding.ActivityMainBinding
+import org.fossify.notes.dialogs.*
+import org.fossify.notes.extensions.*
+import org.fossify.notes.fragments.TextFragment
+import org.fossify.notes.helpers.*
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 import java.io.File
 import java.nio.charset.Charset
-import java.util.*
+import java.util.Arrays
 
 class MainActivity : SimpleActivity() {
     private val EXPORT_FILE_SYNC = 1
@@ -93,10 +93,10 @@ class MainActivity : SimpleActivity() {
 
         updateMaterialActivityViews(binding.mainCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false)
 
-        searchQueryET = findViewById(com.simplemobiletools.commons.R.id.search_query)
-        searchPrevBtn = findViewById(com.simplemobiletools.commons.R.id.search_previous)
-        searchNextBtn = findViewById(com.simplemobiletools.commons.R.id.search_next)
-        searchClearBtn = findViewById(com.simplemobiletools.commons.R.id.search_clear)
+        searchQueryET = findViewById(org.fossify.commons.R.id.search_query)
+        searchPrevBtn = findViewById(org.fossify.commons.R.id.search_previous)
+        searchNextBtn = findViewById(org.fossify.commons.R.id.search_next)
+        searchClearBtn = findViewById(org.fossify.commons.R.id.search_clear)
 
         val noteToOpen = intent.getLongExtra(OPEN_NOTE_ID, -1L)
         initViewPager(noteToOpen)
@@ -104,7 +104,7 @@ class MainActivity : SimpleActivity() {
         val textSize = getPercentageFontSize()
         binding.pagerTabStrip.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
         binding.pagerTabStrip.layoutParams.height =
-            (textSize + resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin) * 2).toInt()
+            (textSize + resources.getDimension(org.fossify.commons.R.dimen.medium_margin) * 2).toInt()
         (binding.pagerTabStrip.layoutParams as ViewPager.LayoutParams).isDecor = true
 
         val hasNoIntent = intent.action.isNullOrEmpty() && noteToOpen == -1L
@@ -122,9 +122,9 @@ class MainActivity : SimpleActivity() {
         checkAppOnSDCard()
         setupSearchButtons()
 
-        if (isPackageInstalled("com.simplemobiletools.notes")) {
-            val dialogText = getString(com.simplemobiletools.commons.R.string.upgraded_from_free_notes)
-            ConfirmationDialog(this, dialogText, 0, com.simplemobiletools.commons.R.string.ok, 0, false) {}
+        if (isPackageInstalled("com.org.fossify.notes")) {
+            val dialogText = getString(org.fossify.commons.R.string.upgraded_from_free_notes)
+            ConfirmationDialog(this, dialogText, 0, org.fossify.commons.R.string.ok, 0, false) {}
         }
     }
 
@@ -146,7 +146,7 @@ class MainActivity : SimpleActivity() {
             val textSize = getPercentageFontSize()
             setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
             layoutParams.height =
-                (textSize + resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin) * 2).toInt()
+                (textSize + resources.getDimension(org.fossify.commons.R.dimen.medium_margin) * 2).toInt()
             setGravity(Gravity.CENTER_VERTICAL)
             setNonPrimaryAlpha(0.4f)
             setTextColor(getProperPrimaryColor())
@@ -201,7 +201,7 @@ class MainActivity : SimpleActivity() {
             findItem(R.id.import_folder).isVisible = !isQPlus()
             findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && !mCurrentNote.isLocked())
             findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() && (::mCurrentNote.isInitialized && mCurrentNote.isLocked())
-            findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)
+            findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)
 
             saveNoteButton = findItem(R.id.save_note)
             saveNoteButton!!.isVisible =
@@ -272,8 +272,8 @@ class MainActivity : SimpleActivity() {
                 this,
                 "",
                 R.string.unsaved_changes_warning,
-                com.simplemobiletools.commons.R.string.save,
-                com.simplemobiletools.commons.R.string.discard
+                org.fossify.commons.R.string.save,
+                org.fossify.commons.R.string.discard
             ) {
                 if (it) {
                     mAdapter?.saveAllFragmentTexts()
@@ -326,7 +326,7 @@ class MainActivity : SimpleActivity() {
     private fun getNewTextNoteShortcut(appIconColor: Int): ShortcutInfo {
         val shortLabel = getString(R.string.text_note)
         val longLabel = getString(R.string.new_text_note)
-        val drawable = resources.getDrawable(com.simplemobiletools.commons.R.drawable.shortcut_plus)
+        val drawable = resources.getDrawable(org.fossify.commons.R.drawable.shortcut_plus)
         (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor)
         val bmp = drawable.convertToBitmap()
 
@@ -645,15 +645,15 @@ class MainActivity : SimpleActivity() {
         val licenses = LICENSE_RTL
 
         val faqItems = arrayListOf(
-            FAQItem(com.simplemobiletools.commons.R.string.faq_1_title_commons, com.simplemobiletools.commons.R.string.faq_1_text_commons),
+            FAQItem(org.fossify.commons.R.string.faq_1_title_commons, org.fossify.commons.R.string.faq_1_text_commons),
             FAQItem(R.string.faq_1_title, R.string.faq_1_text)
         )
 
-        if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) {
-            faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons))
-            faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons))
-            faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_7_title_commons, com.simplemobiletools.commons.R.string.faq_7_text_commons))
-            faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_10_title_commons, com.simplemobiletools.commons.R.string.faq_10_text_commons))
+        if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) {
+            faqItems.add(FAQItem(org.fossify.commons.R.string.faq_2_title_commons, org.fossify.commons.R.string.faq_2_text_commons))
+            faqItems.add(FAQItem(org.fossify.commons.R.string.faq_6_title_commons, org.fossify.commons.R.string.faq_6_text_commons))
+            faqItems.add(FAQItem(org.fossify.commons.R.string.faq_7_title_commons, org.fossify.commons.R.string.faq_7_text_commons))
+            faqItems.add(FAQItem(org.fossify.commons.R.string.faq_10_title_commons, org.fossify.commons.R.string.faq_10_text_commons))
         }
 
         startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
@@ -673,7 +673,7 @@ class MainActivity : SimpleActivity() {
                     putExtra(Intent.EXTRA_MIME_TYPES, mimetypes)
                     startActivityForResult(this, PICK_OPEN_FILE_INTENT)
                 } catch (e: ActivityNotFoundException) {
-                    toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
+                    toast(org.fossify.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
                 } catch (e: Exception) {
                     showErrorToast(e)
                 }
@@ -710,7 +710,7 @@ class MainActivity : SimpleActivity() {
     private fun checkFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) {
         val file = File(path)
         if (path.isMediaFile()) {
-            toast(com.simplemobiletools.commons.R.string.invalid_file_format)
+            toast(org.fossify.commons.R.string.invalid_file_format)
         } else if (file.length() > 1000 * 1000) {
             toast(R.string.file_too_large)
         } else if (checkTitle && mNotes.any { it.title.equals(path.getFilenameFromPath(), true) }) {
@@ -751,7 +751,7 @@ class MainActivity : SimpleActivity() {
                     if (realPath != null) {
                         openPath(realPath)
                     } else {
-                        com.simplemobiletools.commons.R.string.unknown_error_occurred
+                        org.fossify.commons.R.string.unknown_error_occurred
                     }
                 } else if (realPath != null && realPath != "") {
                     checkFile(realPath, false) {
@@ -848,7 +848,7 @@ class MainActivity : SimpleActivity() {
                     }
                 }
             } else {
-                toast(com.simplemobiletools.commons.R.string.no_storage_permissions)
+                toast(org.fossify.commons.R.string.no_storage_permissions)
             }
         }
     }
@@ -878,7 +878,7 @@ class MainActivity : SimpleActivity() {
                 try {
                     startActivityForResult(this, PICK_EXPORT_FILE_INTENT)
                 } catch (e: ActivityNotFoundException) {
-                    toast(com.simplemobiletools.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
+                    toast(org.fossify.commons.R.string.system_service_disabled, Toast.LENGTH_LONG)
                 } catch (e: NetworkErrorException) {
                     toast(getString(R.string.cannot_load_over_internet), Toast.LENGTH_LONG)
                 } catch (e: Exception) {
@@ -892,7 +892,7 @@ class MainActivity : SimpleActivity() {
         ExportFileDialog(this, mCurrentNote) {
             val textToExport = if (mCurrentNote.type == NoteType.TYPE_TEXT) getCurrentNoteText() else mCurrentNote.value
             if (textToExport == null || textToExport.isEmpty()) {
-                toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
+                toast(org.fossify.commons.R.string.unknown_error_occurred)
             } else if (mCurrentNote.type == NoteType.TYPE_TEXT) {
                 showExportFilePickUpdateDialog(it, textToExport)
             } else {
@@ -941,7 +941,7 @@ class MainActivity : SimpleActivity() {
     private fun exportNoteValueToFile(path: String, content: String, showSuccessToasts: Boolean, callback: ((success: Boolean) -> Unit)? = null) {
         try {
             if (File(path).isDirectory) {
-                toast(com.simplemobiletools.commons.R.string.name_taken)
+                toast(org.fossify.commons.R.string.name_taken)
                 return
             }
 
@@ -1119,7 +1119,7 @@ class MainActivity : SimpleActivity() {
             if (deleteFile) {
                 deleteFile(FileDirItem(note.path, note.title)) {
                     if (!it) {
-                        toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
+                        toast(org.fossify.commons.R.string.unknown_error_occurred)
                     }
                 }
             }
@@ -1172,7 +1172,7 @@ class MainActivity : SimpleActivity() {
         }
 
         val res = resources
-        val shareTitle = res.getString(com.simplemobiletools.commons.R.string.share_via)
+        val shareTitle = res.getString(org.fossify.commons.R.string.share_via)
         Intent().apply {
             action = Intent.ACTION_SEND
             putExtra(Intent.EXTRA_SUBJECT, mCurrentNote.title)
@@ -1207,7 +1207,7 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun lockNote() {
-        ConfirmationDialog(this, "", R.string.locking_warning, com.simplemobiletools.commons.R.string.ok, com.simplemobiletools.commons.R.string.cancel) {
+        ConfirmationDialog(this, "", R.string.locking_warning, org.fossify.commons.R.string.ok, org.fossify.commons.R.string.cancel) {
             SecurityDialog(this, "", SHOW_ALL_TABS) { hash, type, success ->
                 if (success) {
                     mCurrentNote.protectionHash = hash
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt
similarity index 90%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
rename to app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt
index 11ed19aa..057f491c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.activities
+package org.fossify.notes.activities
 
 import android.content.Intent
 import android.net.Uri
@@ -7,21 +7,21 @@ import android.view.Menu
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.text.TextUtilsCompat
 import androidx.core.view.ViewCompat
-import com.simplemobiletools.commons.dialogs.RadioGroupDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.*
-import com.simplemobiletools.commons.models.RadioItem
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.databinding.ActivitySettingsBinding
-import com.simplemobiletools.notes.pro.dialogs.ExportNotesDialog
-import com.simplemobiletools.notes.pro.dialogs.ManageAutoBackupsDialog
-import com.simplemobiletools.notes.pro.extensions.*
-import com.simplemobiletools.notes.pro.helpers.*
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.Widget
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import org.fossify.commons.dialogs.RadioGroupDialog
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.*
+import org.fossify.commons.models.RadioItem
+import org.fossify.notes.R
+import org.fossify.notes.databinding.ActivitySettingsBinding
+import org.fossify.notes.dialogs.ExportNotesDialog
+import org.fossify.notes.dialogs.ManageAutoBackupsDialog
+import org.fossify.notes.extensions.*
+import org.fossify.notes.helpers.*
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.Widget
 import java.util.Locale
 import kotlin.system.exitProcess
 
@@ -84,14 +84,14 @@ class SettingsActivity : SimpleActivity() {
 
     private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
         if (uri != null) {
-            toast(com.simplemobiletools.commons.R.string.importing)
+            toast(org.fossify.commons.R.string.importing)
             importNotes(uri)
         }
     }
 
     private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri ->
         if (uri != null) {
-            toast(com.simplemobiletools.commons.R.string.exporting)
+            toast(org.fossify.commons.R.string.exporting)
             NotesHelper(this).getNotes { notes ->
                 requestUnlockNotes(notes) { unlockedNotes ->
                     val notLockedNotes = notes.filterNot { it.isLocked() }
@@ -314,7 +314,7 @@ class SettingsActivity : SimpleActivity() {
 
     private fun exportNotes(notes: List<Note>, uri: Uri) {
         if (notes.isEmpty()) {
-            toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting)
+            toast(org.fossify.commons.R.string.no_entries_for_exporting)
         } else {
             try {
                 val outputStream = contentResolver.openOutputStream(uri)!!
@@ -323,7 +323,7 @@ class SettingsActivity : SimpleActivity() {
                 outputStream.use {
                     it.write(jsonString.toByteArray())
                 }
-                toast(com.simplemobiletools.commons.R.string.exporting_successful)
+                toast(org.fossify.commons.R.string.exporting_successful)
             } catch (e: Exception) {
                 showErrorToast(e)
             }
@@ -337,21 +337,21 @@ class SettingsActivity : SimpleActivity() {
             }
             val objects = Json.decodeFromString<List<Note>>(jsonString)
             if (objects.isEmpty()) {
-                toast(com.simplemobiletools.commons.R.string.no_entries_for_importing)
+                toast(org.fossify.commons.R.string.no_entries_for_importing)
                 return
             }
             NotesHelper(this).importNotes(this, objects) { importResult ->
                 when (importResult) {
-                    NotesHelper.ImportResult.IMPORT_OK -> toast(com.simplemobiletools.commons.R.string.importing_successful)
-                    NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(com.simplemobiletools.commons.R.string.importing_some_entries_failed)
-                    NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(com.simplemobiletools.commons.R.string.no_new_items)
-                    else -> toast(com.simplemobiletools.commons.R.string.importing_failed)
+                    NotesHelper.ImportResult.IMPORT_OK -> toast(org.fossify.commons.R.string.importing_successful)
+                    NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(org.fossify.commons.R.string.importing_some_entries_failed)
+                    NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(org.fossify.commons.R.string.no_new_items)
+                    else -> toast(org.fossify.commons.R.string.importing_failed)
                 }
             }
         } catch (_: SerializationException) {
-            toast(com.simplemobiletools.commons.R.string.invalid_file_format)
+            toast(org.fossify.commons.R.string.invalid_file_format)
         } catch (_: IllegalArgumentException) {
-            toast(com.simplemobiletools.commons.R.string.invalid_file_format)
+            toast(org.fossify.commons.R.string.invalid_file_format)
         } catch (e: Exception) {
             showErrorToast(e)
         }
diff --git a/app/src/main/kotlin/org/fossify/notes/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SimpleActivity.kt
new file mode 100644
index 00000000..1147f1e2
--- /dev/null
+++ b/app/src/main/kotlin/org/fossify/notes/activities/SimpleActivity.kt
@@ -0,0 +1,30 @@
+package org.fossify.notes.activities
+
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.notes.R
+
+open class SimpleActivity : BaseSimpleActivity() {
+    override fun getAppIconIDs() = arrayListOf(
+        R.mipmap.ic_launcher_red,
+        R.mipmap.ic_launcher_pink,
+        R.mipmap.ic_launcher_purple,
+        R.mipmap.ic_launcher_deep_purple,
+        R.mipmap.ic_launcher_indigo,
+        R.mipmap.ic_launcher_blue,
+        R.mipmap.ic_launcher_light_blue,
+        R.mipmap.ic_launcher_cyan,
+        R.mipmap.ic_launcher_teal,
+        R.mipmap.ic_launcher_green,
+        R.mipmap.ic_launcher_light_green,
+        R.mipmap.ic_launcher_lime,
+        R.mipmap.ic_launcher_yellow,
+        R.mipmap.ic_launcher_amber,
+        R.mipmap.ic_launcher,
+        R.mipmap.ic_launcher_deep_orange,
+        R.mipmap.ic_launcher_brown,
+        R.mipmap.ic_launcher_blue_grey,
+        R.mipmap.ic_launcher_grey_black
+    )
+
+    override fun getAppLauncherName() = getString(R.string.app_launcher_name)
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/SplashActivity.kt
similarity index 73%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt
rename to app/src/main/kotlin/org/fossify/notes/activities/SplashActivity.kt
index 45c8e25f..1724e4c2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/org/fossify/notes/activities/SplashActivity.kt
@@ -1,8 +1,8 @@
-package com.simplemobiletools.notes.pro.activities
+package org.fossify.notes.activities
 
 import android.content.Intent
-import com.simplemobiletools.commons.activities.BaseSplashActivity
-import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID
+import org.fossify.commons.activities.BaseSplashActivity
+import org.fossify.notes.helpers.OPEN_NOTE_ID
 
 class SplashActivity : BaseSplashActivity() {
     override fun initActivity() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt
similarity index 88%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
rename to app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt
index fe58a85d..43190b15 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
+++ b/app/src/main/kotlin/org/fossify/notes/activities/WidgetConfigureActivity.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.activities
+package org.fossify.notes.activities
 
 import android.app.Activity
 import android.appwidget.AppWidgetManager
@@ -12,24 +12,24 @@ import android.util.TypedValue
 import android.widget.RemoteViews
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.simplemobiletools.commons.dialogs.ColorPickerDialog
-import com.simplemobiletools.commons.dialogs.RadioGroupDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.commons.models.RadioItem
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
-import com.simplemobiletools.notes.pro.databinding.WidgetConfigBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
-import com.simplemobiletools.notes.pro.extensions.widgetsDB
-import com.simplemobiletools.notes.pro.helpers.*
-import com.simplemobiletools.notes.pro.models.ChecklistItem
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
-import com.simplemobiletools.notes.pro.models.Widget
+import org.fossify.commons.dialogs.ColorPickerDialog
+import org.fossify.commons.dialogs.RadioGroupDialog
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.commons.models.RadioItem
+import org.fossify.notes.R
+import org.fossify.notes.adapters.ChecklistAdapter
+import org.fossify.notes.databinding.WidgetConfigBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.getPercentageFontSize
+import org.fossify.notes.extensions.widgetsDB
+import org.fossify.notes.helpers.*
+import org.fossify.notes.models.ChecklistItem
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
+import org.fossify.notes.models.Widget
 
 class WidgetConfigureActivity : SimpleActivity() {
     private var mBgAlpha = 0f
@@ -88,8 +88,8 @@ class WidgetConfigureActivity : SimpleActivity() {
             mShowTitle = extras?.getBoolean(CUSTOMIZED_WIDGET_SHOW_TITLE) ?: false
         }
 
-        if (mTextColor == resources.getColor(com.simplemobiletools.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) {
-            mTextColor = resources.getColor(com.simplemobiletools.commons.R.color.you_primary_color, theme)
+        if (mTextColor == resources.getColor(org.fossify.commons.R.color.default_widget_text_color) && config.isUsingSystemTheme) {
+            mTextColor = resources.getColor(org.fossify.commons.R.color.you_primary_color, theme)
         }
 
         mBgAlpha = Color.alpha(mBgColor) / 255.toFloat()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/ChecklistAdapter.kt
similarity index 82%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt
rename to app/src/main/kotlin/org/fossify/notes/adapters/ChecklistAdapter.kt
index 0c7193a3..cc6c50af 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/notes/adapters/ChecklistAdapter.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.adapters
+package org.fossify.notes.adapters
 
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
@@ -9,25 +9,25 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
-import com.simplemobiletools.commons.extensions.applyColorFilter
-import com.simplemobiletools.commons.extensions.beVisibleIf
-import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
-import com.simplemobiletools.commons.extensions.removeBit
-import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
-import com.simplemobiletools.commons.interfaces.ItemMoveCallback
-import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract
-import com.simplemobiletools.commons.interfaces.StartReorderDragListener
-import com.simplemobiletools.commons.views.MyRecyclerView
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.databinding.ItemChecklistBinding
-import com.simplemobiletools.notes.pro.dialogs.RenameChecklistItemDialog
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
-import com.simplemobiletools.notes.pro.helpers.DONE_CHECKLIST_ITEM_ALPHA
-import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener
-import com.simplemobiletools.notes.pro.models.ChecklistItem
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.adapters.MyRecyclerViewAdapter
+import org.fossify.commons.extensions.applyColorFilter
+import org.fossify.commons.extensions.beVisibleIf
+import org.fossify.commons.extensions.getColoredDrawableWithColor
+import org.fossify.commons.extensions.removeBit
+import org.fossify.commons.helpers.SORT_BY_CUSTOM
+import org.fossify.commons.interfaces.ItemMoveCallback
+import org.fossify.commons.interfaces.ItemTouchHelperContract
+import org.fossify.commons.interfaces.StartReorderDragListener
+import org.fossify.commons.views.MyRecyclerView
+import org.fossify.notes.R
+import org.fossify.notes.databinding.ItemChecklistBinding
+import org.fossify.notes.dialogs.RenameChecklistItemDialog
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.getPercentageFontSize
+import org.fossify.notes.helpers.DONE_CHECKLIST_ITEM_ALPHA
+import org.fossify.notes.interfaces.ChecklistItemsListener
+import org.fossify.notes.models.ChecklistItem
 import java.util.Collections
 
 class ChecklistAdapter(
@@ -108,12 +108,12 @@ class ChecklistAdapter(
     private fun initDrawables() {
         val res = activity.resources
         crossDrawable = res.getColoredDrawableWithColor(
-            com.simplemobiletools.commons.R.drawable.ic_cross_vector,
-            res.getColor(com.simplemobiletools.commons.R.color.md_red_700)
+            org.fossify.commons.R.drawable.ic_cross_vector,
+            res.getColor(org.fossify.commons.R.color.md_red_700)
         )
         checkDrawable = res.getColoredDrawableWithColor(
-            com.simplemobiletools.commons.R.drawable.ic_check_vector,
-            res.getColor(com.simplemobiletools.commons.R.color.md_green_700)
+            org.fossify.commons.R.drawable.ic_check_vector,
+            res.getColor(org.fossify.commons.R.color.md_green_700)
         )
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt
similarity index 87%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt
rename to app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt
index 909659f1..bf2d6f38 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/NotesPagerAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/notes/adapters/NotesPagerAdapter.kt
@@ -1,17 +1,17 @@
-package com.simplemobiletools.notes.pro.adapters
+package org.fossify.notes.adapters
 
 import android.app.Activity
 import android.os.Bundle
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
-import com.simplemobiletools.commons.extensions.showErrorToast
-import com.simplemobiletools.notes.pro.fragments.ChecklistFragment
-import com.simplemobiletools.notes.pro.fragments.NoteFragment
-import com.simplemobiletools.notes.pro.fragments.TextFragment
-import com.simplemobiletools.notes.pro.helpers.NOTE_ID
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.extensions.showErrorToast
+import org.fossify.notes.fragments.ChecklistFragment
+import org.fossify.notes.fragments.NoteFragment
+import org.fossify.notes.fragments.TextFragment
+import org.fossify.notes.helpers.NOTE_ID
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 
 class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity: Activity) : FragmentStatePagerAdapter(fm) {
     private var fragments: HashMap<Int, NoteFragment> = LinkedHashMap()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt
similarity index 78%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt
rename to app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt
index 904222d2..8e166ba0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/notes/adapters/OpenNoteAdapter.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.adapters
+package org.fossify.notes.adapters
 
 import android.content.Context
 import android.graphics.Color
@@ -9,20 +9,20 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
-import com.simplemobiletools.commons.extensions.beGoneIf
-import com.simplemobiletools.commons.extensions.beVisibleIf
-import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
-import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme
-import com.simplemobiletools.commons.helpers.LOWER_ALPHA_INT
-import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
-import com.simplemobiletools.commons.views.MyRecyclerView
-import com.simplemobiletools.notes.pro.databinding.OpenNoteItemBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.models.ChecklistItem
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.adapters.MyRecyclerViewAdapter
+import org.fossify.commons.extensions.beGoneIf
+import org.fossify.commons.extensions.beVisibleIf
+import org.fossify.commons.extensions.getColoredDrawableWithColor
+import org.fossify.commons.extensions.isBlackAndWhiteTheme
+import org.fossify.commons.helpers.LOWER_ALPHA_INT
+import org.fossify.commons.helpers.SORT_BY_CUSTOM
+import org.fossify.commons.views.MyRecyclerView
+import org.fossify.notes.databinding.OpenNoteItemBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.models.ChecklistItem
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 
 class OpenNoteAdapter(
     activity: BaseSimpleActivity, var items: List<Note>,
@@ -70,7 +70,7 @@ class OpenNoteAdapter(
             val formattedText = note.getFormattedValue(root.context)
             openNoteItemText.beGoneIf(formattedText.isNullOrBlank() || note.isLocked())
             iconLock.beVisibleIf(note.isLocked())
-            iconLock.setImageDrawable(activity.resources.getColoredDrawableWithColor(com.simplemobiletools.commons.R.drawable.ic_lock_vector, properPrimaryColor))
+            iconLock.setImageDrawable(activity.resources.getColoredDrawableWithColor(org.fossify.commons.R.drawable.ic_lock_vector, properPrimaryColor))
             openNoteItemText.apply {
                 text = formattedText
                 setTextColor(textColor)
@@ -80,7 +80,7 @@ class OpenNoteAdapter(
 
     private fun View.setupCard() {
         if (context.isBlackAndWhiteTheme()) {
-            setBackgroundResource(com.simplemobiletools.commons.R.drawable.black_dialog_background)
+            setBackgroundResource(org.fossify.commons.R.drawable.black_dialog_background)
         } else {
             val cardBackgroundColor = if (backgroundColor == Color.BLACK) {
                 Color.WHITE
@@ -88,9 +88,9 @@ class OpenNoteAdapter(
                 Color.BLACK
             }
             val cardBackground = if (context.config.isUsingSystemTheme) {
-                com.simplemobiletools.commons.R.drawable.dialog_you_background
+                org.fossify.commons.R.drawable.dialog_you_background
             } else {
-                com.simplemobiletools.commons.R.drawable.dialog_bg
+                org.fossify.commons.R.drawable.dialog_bg
             }
             background =
                 activity.resources.getColoredDrawableWithColor(cardBackground, cardBackgroundColor, LOWER_ALPHA_INT)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt b/app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt
similarity index 84%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt
rename to app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt
index 8aaf006f..e9b47694 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/notes/adapters/WidgetAdapter.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.adapters
+package org.fossify.notes.adapters
 
 import android.content.Context
 import android.content.Intent
@@ -6,22 +6,21 @@ import android.graphics.Paint
 import android.view.View
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
-import com.simplemobiletools.commons.extensions.adjustAlpha
-import com.simplemobiletools.commons.extensions.setText
-import com.simplemobiletools.commons.extensions.setTextSize
-import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
-import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.R.id.widget_text_holder
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
-import com.simplemobiletools.notes.pro.extensions.notesDB
-import com.simplemobiletools.notes.pro.helpers.*
-import com.simplemobiletools.notes.pro.models.ChecklistItem
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
+import org.fossify.commons.extensions.adjustAlpha
+import org.fossify.commons.extensions.setText
+import org.fossify.commons.extensions.setTextSize
+import org.fossify.commons.helpers.SORT_BY_CUSTOM
+import org.fossify.commons.helpers.WIDGET_TEXT_COLOR
+import org.fossify.notes.R
+import org.fossify.notes.R.id.widget_text_holder
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.getPercentageFontSize
+import org.fossify.notes.extensions.notesDB
+import org.fossify.notes.helpers.*
+import org.fossify.notes.models.ChecklistItem
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 
 class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsService.RemoteViewsFactory {
     private val textIds = arrayOf(
@@ -130,10 +129,10 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
 
             // checklist title can be null only because of the glitch in upgrade to 6.6.0, remove this check in the future
             checklistItems = checklistItems.filter { it.title != null }.toMutableList() as ArrayList<ChecklistItem>
-            val sorting = context.config?.sorting ?: 0
+            val sorting = context.config.sorting
             if (sorting and SORT_BY_CUSTOM == 0) {
                 checklistItems.sort()
-                if (context?.config?.moveDoneChecklistItems == true) {
+                if (context.config?.moveDoneChecklistItems == true) {
                     checklistItems.sortBy { it.isDone }
                 }
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt b/app/src/main/kotlin/org/fossify/notes/databases/NotesDatabase.kt
similarity index 83%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
rename to app/src/main/kotlin/org/fossify/notes/databases/NotesDatabase.kt
index f26818b5..9e7aa1a6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
+++ b/app/src/main/kotlin/org/fossify/notes/databases/NotesDatabase.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.databases
+package org.fossify.notes.databases
 
 import android.content.Context
 import androidx.room.Database
@@ -6,14 +6,14 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.helpers.DEFAULT_WIDGET_TEXT_COLOR
-import com.simplemobiletools.notes.pro.interfaces.NotesDao
-import com.simplemobiletools.notes.pro.interfaces.WidgetsDao
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
-import com.simplemobiletools.notes.pro.models.Widget
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.notes.R
+import org.fossify.notes.helpers.DEFAULT_WIDGET_TEXT_COLOR
+import org.fossify.notes.interfaces.NotesDao
+import org.fossify.notes.interfaces.WidgetsDao
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
+import org.fossify.notes.models.Widget
 import java.util.concurrent.Executors
 
 @Database(entities = [Note::class, Widget::class], version = 4)
@@ -28,7 +28,7 @@ abstract class NotesDatabase : RoomDatabase() {
         private var defaultWidgetBgColor = 0
 
         fun getInstance(context: Context): NotesDatabase {
-            defaultWidgetBgColor = context.resources.getColor(com.simplemobiletools.commons.R.color.default_widget_bg_color)
+            defaultWidgetBgColor = context.resources.getColor(org.fossify.commons.R.color.default_widget_bg_color)
             if (db == null) {
                 synchronized(NotesDatabase::class) {
                     if (db == null) {
diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/DateTimePatternInfoDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/DateTimePatternInfoDialog.kt
new file mode 100644
index 00000000..70df7fc0
--- /dev/null
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/DateTimePatternInfoDialog.kt
@@ -0,0 +1,18 @@
+package org.fossify.notes.dialogs
+
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.extensions.getAlertDialogBuilder
+import org.fossify.commons.extensions.setupDialogStuff
+import org.fossify.notes.R
+
+class DateTimePatternInfoDialog(activity: BaseSimpleActivity) {
+
+    init {
+        val view = activity.layoutInflater.inflate(R.layout.datetime_pattern_info_layout, null)
+        activity.getAlertDialogBuilder()
+            .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> { } }
+            .apply {
+                activity.setupDialogStuff(view, this)
+            }
+    }
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DeleteNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/DeleteNoteDialog.kt
similarity index 59%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DeleteNoteDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/DeleteNoteDialog.kt
index 23f096be..d9dc6157 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/DeleteNoteDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/DeleteNoteDialog.kt
@@ -1,20 +1,20 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.extensions.beVisible
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
-import com.simplemobiletools.commons.extensions.setupDialogStuff
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogDeleteNoteBinding
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.extensions.beVisible
+import org.fossify.commons.extensions.getAlertDialogBuilder
+import org.fossify.commons.extensions.setupDialogStuff
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogDeleteNoteBinding
+import org.fossify.notes.models.Note
 
 class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callback: (deleteFile: Boolean) -> Unit) {
     var dialog: AlertDialog? = null
 
     init {
         val message = String.format(activity.getString(R.string.delete_note_prompt_message), note.title)
-        val binding = DialogDeleteNoteBinding.inflate(activity.layoutInflater).apply{
+        val binding = DialogDeleteNoteBinding.inflate(activity.layoutInflater).apply {
             if (note.path.isNotEmpty()) {
                 deleteNoteCheckbox.text = String.format(activity.getString(R.string.delete_file_itself), note.path)
                 deleteNoteCheckboxHolder.beVisible()
@@ -26,8 +26,8 @@ class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.delete) { dialog, which -> dialogConfirmed(binding.deleteNoteCheckbox.isChecked) }
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.delete) { dialog, which -> dialogConfirmed(binding.deleteNoteCheckbox.isChecked) }
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this)
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFileDialog.kt
similarity index 65%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/ExportFileDialog.kt
index bd393d01..a24b5dc7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFileDialog.kt
@@ -1,13 +1,13 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.dialogs.FilePickerDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogExportFileBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.dialogs.FilePickerDialog
+import org.fossify.commons.extensions.*
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogExportFileBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.models.Note
 import java.io.File
 
 class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callback: (exportPath: String) -> Unit) {
@@ -28,8 +28,8 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this, R.string.export_as_file) { alertDialog ->
                     alertDialog.showKeyboard(binding.fileName)
@@ -38,13 +38,20 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac
                         val extension = binding.extension.value
 
                         if (filename.isEmpty()) {
-                            activity.toast(com.simplemobiletools.commons.R.string.filename_cannot_be_empty)
+                            activity.toast(org.fossify.commons.R.string.filename_cannot_be_empty)
                             return@setOnClickListener
                         }
 
                         val fullFilename = if (extension.isEmpty()) filename else "$filename.$extension"
                         if (!fullFilename.isAValidFilename()) {
-                            activity.toast(String.format(activity.getString(com.simplemobiletools.commons.R.string.filename_invalid_characters_placeholder, fullFilename)))
+                            activity.toast(
+                                String.format(
+                                    activity.getString(
+                                        org.fossify.commons.R.string.filename_invalid_characters_placeholder,
+                                        fullFilename
+                                    )
+                                )
+                            )
                             return@setOnClickListener
                         }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFilesDialog.kt
similarity index 71%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/ExportFilesDialog.kt
index 553b1817..e25f7aed 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportFilesDialog.kt
@@ -1,13 +1,13 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.dialogs.FilePickerDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogExportFilesBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.dialogs.FilePickerDialog
+import org.fossify.commons.extensions.*
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogExportFilesBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.models.Note
 
 class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList<Note>, val callback: (parent: String, extension: String) -> Unit) {
     init {
@@ -25,8 +25,8 @@ class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList<Note>
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this, R.string.export_as_file) { alertDialog ->
                     alertDialog.showKeyboard(binding.extension)
diff --git a/app/src/main/kotlin/org/fossify/notes/dialogs/ExportNotesDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportNotesDialog.kt
new file mode 100644
index 00000000..c5e00e38
--- /dev/null
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ExportNotesDialog.kt
@@ -0,0 +1,42 @@
+package org.fossify.notes.dialogs
+
+import androidx.appcompat.app.AlertDialog
+import org.fossify.commons.extensions.*
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogExportNotesBinding
+
+class ExportNotesDialog(val activity: SimpleActivity, callback: (filename: String) -> Unit) {
+
+    init {
+        val binding = DialogExportNotesBinding.inflate(activity.layoutInflater).apply {
+            exportNotesFilename.setText(
+                buildString {
+                    append(root.context.getString(org.fossify.commons.R.string.notes))
+                    append("_")
+                    append(root.context.getCurrentFormattedDateTime())
+                }
+            )
+        }
+
+        activity.getAlertDialogBuilder().setPositiveButton(org.fossify.commons.R.string.ok, null).setNegativeButton(org.fossify.commons.R.string.cancel, null)
+            .apply {
+                activity.setupDialogStuff(binding.root, this, R.string.export_notes) { alertDialog ->
+                    alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+
+                        val filename = binding.exportNotesFilename.value
+                        when {
+                            filename.isEmpty() -> activity.toast(org.fossify.commons.R.string.empty_name)
+                            filename.isAValidFilename() -> {
+                                callback(filename)
+                                alertDialog.dismiss()
+                            }
+
+                            else -> activity.toast(org.fossify.commons.R.string.invalid_name)
+                        }
+                    }
+                }
+            }
+    }
+}
+
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ImportFolderDialog.kt
similarity index 75%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/ImportFolderDialog.kt
index a007e878..c6dc7d47 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ImportFolderDialog.kt
@@ -1,17 +1,17 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogImportFolderBinding
-import com.simplemobiletools.notes.pro.extensions.notesDB
-import com.simplemobiletools.notes.pro.extensions.parseChecklistItems
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogImportFolderBinding
+import org.fossify.notes.extensions.notesDB
+import org.fossify.notes.extensions.parseChecklistItems
+import org.fossify.notes.helpers.NotesHelper
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 import java.io.File
 
 class ImportFolderDialog(val activity: SimpleActivity, val path: String, val callback: () -> Unit) : AlertDialog.Builder(activity) {
@@ -23,8 +23,8 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this, R.string.import_folder) { alertDialog ->
                     dialog = alertDialog
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/ManageAutoBackupsDialog.kt
similarity index 73%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/ManageAutoBackupsDialog.kt
index c88a0d4a..7c7c1dfb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ManageAutoBackupsDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/ManageAutoBackupsDialog.kt
@@ -1,12 +1,12 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.dialogs.FilePickerDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogManageAutomaticBackupsBinding
-import com.simplemobiletools.notes.pro.extensions.config
+import org.fossify.commons.dialogs.FilePickerDialog
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogManageAutomaticBackupsBinding
+import org.fossify.notes.extensions.config
 import java.io.File
 
 class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) {
@@ -19,7 +19,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: (
         binding.apply {
             backupNotesFolder.setText(activity.humanizePath(backupFolder))
             val filename = config.autoBackupFilename.ifEmpty {
-                "${activity.getString(com.simplemobiletools.commons.R.string.notes)}_%Y%M%D_%h%m%s"
+                "${activity.getString(org.fossify.commons.R.string.notes)}_%Y%M%D_%h%m%s"
             }
 
             backupNotesFilename.setText(filename)
@@ -38,18 +38,18 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: (
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
-                activity.setupDialogStuff(view, this, com.simplemobiletools.commons.R.string.manage_automatic_backups) { dialog ->
+                activity.setupDialogStuff(view, this, org.fossify.commons.R.string.manage_automatic_backups) { dialog ->
                     dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                         val filename = binding.backupNotesFilename.value
                         when {
-                            filename.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
+                            filename.isEmpty() -> activity.toast(org.fossify.commons.R.string.empty_name)
                             filename.isAValidFilename() -> {
                                 val file = File(backupFolder, "$filename.json")
                                 if (file.exists() && !file.canWrite()) {
-                                    activity.toast(com.simplemobiletools.commons.R.string.name_taken)
+                                    activity.toast(org.fossify.commons.R.string.name_taken)
                                     return@setOnClickListener
                                 }
 
@@ -67,7 +67,7 @@ class ManageAutoBackupsDialog(private val activity: SimpleActivity, onSuccess: (
                                 }
                             }
 
-                            else -> activity.toast(com.simplemobiletools.commons.R.string.invalid_name)
+                            else -> activity.toast(org.fossify.commons.R.string.invalid_name)
                         }
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt
similarity index 80%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt
index 8244d7aa..9f57ac2f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/NewChecklistItemDialog.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import android.app.Activity
 import android.content.DialogInterface.BUTTON_POSITIVE
@@ -6,13 +6,13 @@ import android.view.KeyEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import androidx.appcompat.widget.AppCompatEditText
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.DARK_GREY
-import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.databinding.DialogNewChecklistItemBinding
-import com.simplemobiletools.notes.pro.databinding.ItemAddChecklistBinding
-import com.simplemobiletools.notes.pro.extensions.config
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.DARK_GREY
+import org.fossify.commons.helpers.SORT_BY_CUSTOM
+import org.fossify.notes.R
+import org.fossify.notes.databinding.DialogNewChecklistItemBinding
+import org.fossify.notes.databinding.ItemAddChecklistBinding
+import org.fossify.notes.extensions.config
 
 class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
     private val titles = mutableListOf<AppCompatEditText>()
@@ -37,15 +37,15 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(view, this, R.string.add_new_checklist_items) { alertDialog ->
                     alertDialog.showKeyboard(titles.first())
                     alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
                         activity.config.addNewChecklistItemsTop = binding.settingsAddChecklistTop.isChecked
                         when {
-                            titles.all { it.text!!.isEmpty() } -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
+                            titles.all { it.text!!.isEmpty() } -> activity.toast(org.fossify.commons.R.string.empty_name)
                             else -> {
                                 val titles = titles.map { it.text.toString() }.filter { it.isNotEmpty() }.toMutableList() as ArrayList<String>
                                 callback(titles)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/NewNoteDialog.kt
similarity index 74%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/NewNoteDialog.kt
index 502abca6..8014b367 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/NewNoteDialog.kt
@@ -1,16 +1,16 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import android.app.Activity
 import android.content.DialogInterface.BUTTON_POSITIVE
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.databinding.DialogNewNoteBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.notesDB
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.R
+import org.fossify.notes.databinding.DialogNewNoteBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.notesDB
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 
 class NewNoteDialog(val activity: Activity, title: String? = null, val setChecklistAsDefault: Boolean, callback: (note: Note) -> Unit) {
     init {
@@ -27,8 +27,8 @@ class NewNoteDialog(val activity: Activity, title: String? = null, val setCheckl
         binding.lockedNoteTitle.setText(title)
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this, R.string.new_note) { alertDialog ->
                     alertDialog.showKeyboard(binding.lockedNoteTitle)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenFileDialog.kt
similarity index 67%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/OpenFileDialog.kt
index f1ce7721..4deb61ae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenFileDialog.kt
@@ -1,16 +1,16 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
-import com.simplemobiletools.commons.extensions.getFilenameFromPath
-import com.simplemobiletools.commons.extensions.humanizePath
-import com.simplemobiletools.commons.extensions.setupDialogStuff
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogOpenFileBinding
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.extensions.getAlertDialogBuilder
+import org.fossify.commons.extensions.getFilenameFromPath
+import org.fossify.commons.extensions.humanizePath
+import org.fossify.commons.extensions.setupDialogStuff
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogOpenFileBinding
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 import java.io.File
 
 class OpenFileDialog(val activity: SimpleActivity, val path: String, val callback: (note: Note) -> Unit) : AlertDialog.Builder(activity) {
@@ -22,8 +22,8 @@ class OpenFileDialog(val activity: SimpleActivity, val path: String, val callbac
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this, R.string.open_file) { alertDialog ->
                     dialog = alertDialog
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenNoteDialog.kt
similarity index 67%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/OpenNoteDialog.kt
index 7a7b4fbc..9e412449 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenNoteDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/OpenNoteDialog.kt
@@ -1,16 +1,16 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
-import com.simplemobiletools.commons.extensions.setupDialogStuff
-import com.simplemobiletools.commons.views.AutoStaggeredGridLayoutManager
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.adapters.OpenNoteAdapter
-import com.simplemobiletools.notes.pro.databinding.DialogOpenNoteBinding
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.extensions.getAlertDialogBuilder
+import org.fossify.commons.extensions.setupDialogStuff
+import org.fossify.commons.views.AutoStaggeredGridLayoutManager
+import org.fossify.notes.R
+import org.fossify.notes.adapters.OpenNoteAdapter
+import org.fossify.notes.databinding.DialogOpenNoteBinding
+import org.fossify.notes.helpers.NotesHelper
+import org.fossify.notes.models.Note
 
 class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId: Long, newNote: Note?) -> Unit) {
     private var dialog: AlertDialog? = null
@@ -41,7 +41,7 @@ class OpenNoteDialog(val activity: BaseSimpleActivity, val callback: (checkedId:
         }
 
         activity.getAlertDialogBuilder()
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this, R.string.open_note) { alertDialog ->
                     dialog = alertDialog
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameChecklistItemDialog.kt
similarity index 73%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/RenameChecklistItemDialog.kt
index dc1804af..bf9a318b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameChecklistItemDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameChecklistItemDialog.kt
@@ -1,9 +1,9 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import android.app.Activity
 import android.content.DialogInterface.BUTTON_POSITIVE
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.notes.pro.databinding.DialogRenameChecklistItemBinding
+import org.fossify.commons.extensions.*
+import org.fossify.notes.databinding.DialogRenameChecklistItemBinding
 
 class RenameChecklistItemDialog(val activity: Activity, val oldTitle: String, callback: (newTitle: String) -> Unit) {
     init {
@@ -12,15 +12,15 @@ class RenameChecklistItemDialog(val activity: Activity, val oldTitle: String, ca
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(binding.root, this) { alertDialog ->
                     alertDialog.showKeyboard(binding.checklistItemTitle)
                     alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
                         val newTitle = binding.checklistItemTitle.value
                         when {
-                            newTitle.isEmpty() -> activity.toast(com.simplemobiletools.commons.R.string.empty_name)
+                            newTitle.isEmpty() -> activity.toast(org.fossify.commons.R.string.empty_name)
                             else -> {
                                 callback(newTitle)
                                 alertDialog.dismiss()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameNoteDialog.kt
similarity index 71%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/RenameNoteDialog.kt
index 65833769..762883a8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/RenameNoteDialog.kt
@@ -1,17 +1,17 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import android.content.DialogInterface.BUTTON_POSITIVE
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogRenameNoteBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.notesDB
-import com.simplemobiletools.notes.pro.extensions.updateWidgets
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogRenameNoteBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.notesDB
+import org.fossify.notes.extensions.updateWidgets
+import org.fossify.notes.helpers.NotesHelper
+import org.fossify.notes.models.Note
 import java.io.File
 
 class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val currentNoteText: String?, val callback: (note: Note) -> Unit) {
@@ -22,8 +22,8 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current
         binding.lockedNoteTitle.setText(note.title)
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(view, this, R.string.rename_note) { alertDialog ->
                     alertDialog.showKeyboard(binding.lockedNoteTitle)
@@ -56,14 +56,14 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current
                     }
                 } else {
                     if (title.isEmpty()) {
-                        activity.toast(com.simplemobiletools.commons.R.string.filename_cannot_be_empty)
+                        activity.toast(org.fossify.commons.R.string.filename_cannot_be_empty)
                         return
                     }
 
                     val file = File(path)
                     val newFile = File(file.parent, title)
                     if (!newFile.name.isAValidFilename()) {
-                        activity.toast(com.simplemobiletools.commons.R.string.invalid_name)
+                        activity.toast(org.fossify.commons.R.string.invalid_name)
                         return
                     }
 
@@ -75,7 +75,7 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current
                                 callback(note)
                             }
                         } else {
-                            activity.toast(com.simplemobiletools.commons.R.string.rename_file_error)
+                            activity.toast(org.fossify.commons.R.string.rename_file_error)
                             return@renameFile
                         }
                     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt
similarity index 73%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt
index 87ab6a9d..ca4057d9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/SortChecklistDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/SortChecklistDialog.kt
@@ -1,16 +1,16 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
-import com.simplemobiletools.commons.extensions.beGoneIf
-import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
-import com.simplemobiletools.commons.extensions.setupDialogStuff
-import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
-import com.simplemobiletools.commons.helpers.SORT_BY_DATE_CREATED
-import com.simplemobiletools.commons.helpers.SORT_BY_TITLE
-import com.simplemobiletools.commons.helpers.SORT_DESCENDING
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.databinding.DialogSortChecklistBinding
-import com.simplemobiletools.notes.pro.extensions.config
+import org.fossify.commons.extensions.beGoneIf
+import org.fossify.commons.extensions.getAlertDialogBuilder
+import org.fossify.commons.extensions.setupDialogStuff
+import org.fossify.commons.helpers.SORT_BY_CUSTOM
+import org.fossify.commons.helpers.SORT_BY_DATE_CREATED
+import org.fossify.commons.helpers.SORT_BY_TITLE
+import org.fossify.commons.helpers.SORT_DESCENDING
+import org.fossify.notes.R
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.databinding.DialogSortChecklistBinding
+import org.fossify.notes.extensions.config
 
 class SortChecklistDialog(private val activity: SimpleActivity, private val callback: () -> Unit) {
     private val binding = DialogSortChecklistBinding.inflate(activity.layoutInflater)
@@ -24,10 +24,10 @@ class SortChecklistDialog(private val activity: SimpleActivity, private val call
         setupMoveUndoneChecklistItems()
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.ok) { _, _ -> dialogConfirmed() }
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> dialogConfirmed() }
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
-                activity.setupDialogStuff(view, this, com.simplemobiletools.commons.R.string.sort_by)
+                activity.setupDialogStuff(view, this, org.fossify.commons.R.string.sort_by)
             }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt b/app/src/main/kotlin/org/fossify/notes/dialogs/UnlockNotesDialog.kt
similarity index 71%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt
rename to app/src/main/kotlin/org/fossify/notes/dialogs/UnlockNotesDialog.kt
index a8f3f11b..eeac1d39 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt
+++ b/app/src/main/kotlin/org/fossify/notes/dialogs/UnlockNotesDialog.kt
@@ -1,20 +1,20 @@
-package com.simplemobiletools.notes.pro.dialogs
+package org.fossify.notes.dialogs
 
 import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.databinding.DialogUnlockNotesBinding
-import com.simplemobiletools.notes.pro.databinding.ItemLockedNoteBinding
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.extensions.*
+import org.fossify.notes.R
+import org.fossify.notes.databinding.DialogUnlockNotesBinding
+import org.fossify.notes.databinding.ItemLockedNoteBinding
+import org.fossify.notes.models.Note
 
 class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>, callback: (unlockedNotes: List<Note>) -> Unit) {
     private var dialog: AlertDialog? = null
     private val binding = DialogUnlockNotesBinding.inflate(activity.layoutInflater)
     private val view = binding.root
-    private val redColor = activity.getColor(com.simplemobiletools.commons.R.color.md_red)
-    private val greenColor = activity.getColor(com.simplemobiletools.commons.R.color.md_green)
+    private val redColor = activity.getColor(org.fossify.commons.R.color.md_red)
+    private val greenColor = activity.getColor(org.fossify.commons.R.color.md_green)
     private val unlockedNoteIds = mutableListOf<Long>()
 
     init {
@@ -23,8 +23,8 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
         }
 
         activity.getAlertDialogBuilder()
-            .setPositiveButton(com.simplemobiletools.commons.R.string.skip, null)
-            .setNegativeButton(com.simplemobiletools.commons.R.string.cancel, null)
+            .setPositiveButton(org.fossify.commons.R.string.skip, null)
+            .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .apply {
                 activity.setupDialogStuff(view, this, R.string.unlock_notes, cancelOnTouchOutside = false) { alertDialog ->
                     dialog = alertDialog
@@ -59,7 +59,7 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
                 } else {
                     unlockedNoteIds.remove(note.id)
                     lockedUnlockedImage.apply {
-                        setImageResource(com.simplemobiletools.commons.R.drawable.ic_lock_vector)
+                        setImageResource(org.fossify.commons.R.drawable.ic_lock_vector)
                         applyColorFilter(redColor)
                     }
                     updatePositiveButton()
@@ -70,9 +70,9 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List<Note>,
 
     private fun updatePositiveButton() {
         dialog?.getButton(DialogInterface.BUTTON_POSITIVE)?.text = if (unlockedNoteIds.isNotEmpty()) {
-            activity.getString(com.simplemobiletools.commons.R.string.ok)
+            activity.getString(org.fossify.commons.R.string.ok)
         } else {
-            activity.getString(com.simplemobiletools.commons.R.string.skip)
+            activity.getString(org.fossify.commons.R.string.skip)
         }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt b/app/src/main/kotlin/org/fossify/notes/extensions/Context.kt
similarity index 83%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt
rename to app/src/main/kotlin/org/fossify/notes/extensions/Context.kt
index b958e11f..48e5b1c4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/org/fossify/notes/extensions/Context.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.extensions
+package org.fossify.notes.extensions
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -7,19 +7,18 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.AlarmManagerCompat
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ExportResult
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.commons.helpers.isRPlus
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.databases.NotesDatabase
-import com.simplemobiletools.notes.pro.dialogs.UnlockNotesDialog
-import com.simplemobiletools.notes.pro.helpers.*
-import com.simplemobiletools.notes.pro.interfaces.NotesDao
-import com.simplemobiletools.notes.pro.interfaces.WidgetsDao
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.receivers.AutomaticBackupReceiver
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.ExportResult
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.commons.helpers.isRPlus
+import org.fossify.notes.databases.NotesDatabase
+import org.fossify.notes.dialogs.UnlockNotesDialog
+import org.fossify.notes.helpers.*
+import org.fossify.notes.interfaces.NotesDao
+import org.fossify.notes.interfaces.WidgetsDao
+import org.fossify.notes.models.Note
+import org.fossify.notes.receivers.AutomaticBackupReceiver
 import org.joda.time.DateTime
 import java.io.File
 import java.io.FileOutputStream
@@ -41,7 +40,7 @@ fun Context.updateWidgets() {
     }
 }
 
-fun Context.getPercentageFontSize() = resources.getDimension(com.simplemobiletools.commons.R.dimen.middle_text_size) * (config.fontSizePercentage / 100f)
+fun Context.getPercentageFontSize() = resources.getDimension(org.fossify.commons.R.dimen.middle_text_size) * (config.fontSizePercentage / 100f)
 
 fun BaseSimpleActivity.requestUnlockNotes(notes: List<Note>, callback: (unlockedNotes: List<Note>) -> Unit) {
     val lockedNotes = notes.filter { it.isLocked() }
@@ -95,7 +94,7 @@ fun Context.backupNotes() {
         val config = config
         NotesHelper(this).getNotes { notesToBackup ->
             if (notesToBackup.isEmpty()) {
-                toast(com.simplemobiletools.commons.R.string.no_entries_for_exporting)
+                toast(org.fossify.commons.R.string.no_entries_for_exporting)
                 config.lastAutoBackupTime = DateTime.now().millis
                 scheduleNextAutomaticBackup()
                 return@getNotes
@@ -153,7 +152,7 @@ fun Context.backupNotes() {
             }
 
             if (exportResult == ExportResult.EXPORT_FAIL) {
-                toast(com.simplemobiletools.commons.R.string.exporting_failed)
+                toast(org.fossify.commons.R.string.exporting_failed)
             }
 
             config.lastAutoBackupTime = DateTime.now().millis
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Fragment.kt b/app/src/main/kotlin/org/fossify/notes/extensions/Fragment.kt
similarity index 56%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Fragment.kt
rename to app/src/main/kotlin/org/fossify/notes/extensions/Fragment.kt
index 4a1bc2ee..374fc60e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Fragment.kt
+++ b/app/src/main/kotlin/org/fossify/notes/extensions/Fragment.kt
@@ -1,6 +1,6 @@
-package com.simplemobiletools.notes.pro.extensions
+package org.fossify.notes.extensions
 
 import androidx.fragment.app.Fragment
-import com.simplemobiletools.notes.pro.helpers.Config
+import org.fossify.notes.helpers.Config
 
 val Fragment.config: Config? get() = if (context != null) Config.newInstance(context!!) else null
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt b/app/src/main/kotlin/org/fossify/notes/extensions/String.kt
similarity index 79%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt
rename to app/src/main/kotlin/org/fossify/notes/extensions/String.kt
index 5ecf3bf2..fb763260 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/String.kt
+++ b/app/src/main/kotlin/org/fossify/notes/extensions/String.kt
@@ -1,8 +1,8 @@
-package com.simplemobiletools.notes.pro.extensions
+package org.fossify.notes.extensions
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.simplemobiletools.notes.pro.models.ChecklistItem
+import org.fossify.notes.models.ChecklistItem
 
 fun String.parseChecklistItems(): ArrayList<ChecklistItem>? {
     if (startsWith("[{") && endsWith("}]")) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/ChecklistFragment.kt
similarity index 89%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
rename to app/src/main/kotlin/org/fossify/notes/fragments/ChecklistFragment.kt
index 04003ed7..390e09d0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
+++ b/app/src/main/kotlin/org/fossify/notes/fragments/ChecklistFragment.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.fragments
+package org.fossify.notes.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,20 +8,20 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.activities.SimpleActivity
-import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
-import com.simplemobiletools.notes.pro.databinding.FragmentChecklistBinding
-import com.simplemobiletools.notes.pro.dialogs.NewChecklistItemDialog
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.updateWidgets
-import com.simplemobiletools.notes.pro.helpers.NOTE_ID
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener
-import com.simplemobiletools.notes.pro.models.ChecklistItem
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.SORT_BY_CUSTOM
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.activities.SimpleActivity
+import org.fossify.notes.adapters.ChecklistAdapter
+import org.fossify.notes.databinding.FragmentChecklistBinding
+import org.fossify.notes.dialogs.NewChecklistItemDialog
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.updateWidgets
+import org.fossify.notes.helpers.NOTE_ID
+import org.fossify.notes.helpers.NotesHelper
+import org.fossify.notes.interfaces.ChecklistItemsListener
+import org.fossify.notes.models.ChecklistItem
+import org.fossify.notes.models.Note
 import java.io.File
 
 class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/NoteFragment.kt
similarity index 84%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt
rename to app/src/main/kotlin/org/fossify/notes/fragments/NoteFragment.kt
index 132e80d0..d46dba33 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt
+++ b/app/src/main/kotlin/org/fossify/notes/fragments/NoteFragment.kt
@@ -1,17 +1,17 @@
-package com.simplemobiletools.notes.pro.fragments
+package org.fossify.notes.fragments
 
 import android.util.TypedValue
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.notes.pro.activities.MainActivity
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.commons.extensions.*
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.notes.activities.MainActivity
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.getPercentageFontSize
+import org.fossify.notes.helpers.NotesHelper
+import org.fossify.notes.models.Note
 
 abstract class NoteFragment : Fragment() {
     protected var note: Note? = null
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/org/fossify/notes/fragments/TextFragment.kt
similarity index 91%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
rename to app/src/main/kotlin/org/fossify/notes/fragments/TextFragment.kt
index ff142fbb..4abcc0d3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
+++ b/app/src/main/kotlin/org/fossify/notes/fragments/TextFragment.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.fragments
+package org.fossify.notes.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -19,22 +19,21 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.viewbinding.ViewBinding
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.views.MyEditText
-import com.simplemobiletools.commons.views.MyTextView
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.MainActivity
-import com.simplemobiletools.notes.pro.databinding.FragmentTextBinding
-import com.simplemobiletools.notes.pro.databinding.NoteViewHorizScrollableBinding
-import com.simplemobiletools.notes.pro.databinding.NoteViewStaticBinding
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
-import com.simplemobiletools.notes.pro.extensions.updateWidgets
-import com.simplemobiletools.notes.pro.helpers.MyMovementMethod
-import com.simplemobiletools.notes.pro.helpers.NOTE_ID
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.models.TextHistory
-import com.simplemobiletools.notes.pro.models.TextHistoryItem
+import org.fossify.commons.extensions.*
+import org.fossify.commons.views.MyEditText
+import org.fossify.notes.R
+import org.fossify.notes.activities.MainActivity
+import org.fossify.notes.databinding.FragmentTextBinding
+import org.fossify.notes.databinding.NoteViewHorizScrollableBinding
+import org.fossify.notes.databinding.NoteViewStaticBinding
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.getPercentageFontSize
+import org.fossify.notes.extensions.updateWidgets
+import org.fossify.notes.helpers.MyMovementMethod
+import org.fossify.notes.helpers.NOTE_ID
+import org.fossify.notes.helpers.NotesHelper
+import org.fossify.notes.models.TextHistory
+import org.fossify.notes.models.TextHistoryItem
 import java.io.File
 
 // text history handling taken from https://gist.github.com/zeleven/0cfa738c1e8b65b23ff7df1fc30c9f7e
@@ -55,7 +54,7 @@ class TextFragment : NoteFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentTextBinding.inflate(inflater, container, false)
         noteId = requireArguments().getLong(NOTE_ID, 0L)
-        moveXThreshold = resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin).toInt()
+        moveXThreshold = resources.getDimension(org.fossify.commons.R.dimen.activity_margin).toInt()
         retainInstance = true
 
         innerBinding = if (config!!.enableLineWrap) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt b/app/src/main/kotlin/org/fossify/notes/helpers/CollatorBasedComparator.kt
similarity index 98%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt
rename to app/src/main/kotlin/org/fossify/notes/helpers/CollatorBasedComparator.kt
index 3ac26f17..e83127a4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/CollatorBasedComparator.kt
+++ b/app/src/main/kotlin/org/fossify/notes/helpers/CollatorBasedComparator.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.helpers
+package org.fossify.notes.helpers
 
 import java.text.Collator
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt b/app/src/main/kotlin/org/fossify/notes/helpers/Config.kt
similarity index 96%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt
rename to app/src/main/kotlin/org/fossify/notes/helpers/Config.kt
index 99efa930..f99d30e0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/org/fossify/notes/helpers/Config.kt
@@ -1,10 +1,10 @@
-package com.simplemobiletools.notes.pro.helpers
+package org.fossify.notes.helpers
 
 import android.content.Context
 import android.os.Environment
 import android.view.Gravity
-import com.simplemobiletools.commons.helpers.BaseConfig
-import com.simplemobiletools.notes.pro.models.NoteType
+import org.fossify.commons.helpers.BaseConfig
+import org.fossify.notes.models.NoteType
 
 class Config(context: Context) : BaseConfig(context) {
     companion object {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt
similarity index 98%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
rename to app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt
index a61b28d5..ba9e2e9b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/org/fossify/notes/helpers/Constants.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.helpers
+package org.fossify.notes.helpers
 
 import android.graphics.Color
 import org.joda.time.DateTime
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyMovementMethod.kt b/app/src/main/kotlin/org/fossify/notes/helpers/MyMovementMethod.kt
similarity index 86%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyMovementMethod.kt
rename to app/src/main/kotlin/org/fossify/notes/helpers/MyMovementMethod.kt
index 90a5fed4..93b83fc0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyMovementMethod.kt
+++ b/app/src/main/kotlin/org/fossify/notes/helpers/MyMovementMethod.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.helpers
+package org.fossify.notes.helpers
 
 import android.text.Selection
 import android.text.Spannable
@@ -41,9 +41,11 @@ class MyMovementMethod : ArrowKeyMovementMethod() {
                 if (action == MotionEvent.ACTION_UP) {
                     links[0].onClick(widget)
                 } else if (action == MotionEvent.ACTION_DOWN) {
-                    Selection.setSelection(buffer,
-                            buffer.getSpanStart(links[0]),
-                            buffer.getSpanEnd(links[0]))
+                    Selection.setSelection(
+                        buffer,
+                        buffer.getSpanStart(links[0]),
+                        buffer.getSpanEnd(links[0])
+                    )
                 }
                 return true
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/org/fossify/notes/helpers/MyWidgetProvider.kt
similarity index 79%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt
rename to app/src/main/kotlin/org/fossify/notes/helpers/MyWidgetProvider.kt
index 8beda98e..a8415881 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt
+++ b/app/src/main/kotlin/org/fossify/notes/helpers/MyWidgetProvider.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.helpers
+package org.fossify.notes.helpers
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
@@ -7,18 +7,18 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.RemoteViews
-import com.simplemobiletools.commons.extensions.applyColorFilter
-import com.simplemobiletools.commons.extensions.getLaunchIntent
-import com.simplemobiletools.commons.extensions.setText
-import com.simplemobiletools.commons.extensions.setVisibleIf
-import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.activities.SplashActivity
-import com.simplemobiletools.notes.pro.extensions.notesDB
-import com.simplemobiletools.notes.pro.extensions.widgetsDB
-import com.simplemobiletools.notes.pro.models.Widget
-import com.simplemobiletools.notes.pro.services.WidgetService
+import org.fossify.commons.extensions.applyColorFilter
+import org.fossify.commons.extensions.getLaunchIntent
+import org.fossify.commons.extensions.setText
+import org.fossify.commons.extensions.setVisibleIf
+import org.fossify.commons.helpers.WIDGET_TEXT_COLOR
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.R
+import org.fossify.notes.activities.SplashActivity
+import org.fossify.notes.extensions.notesDB
+import org.fossify.notes.extensions.widgetsDB
+import org.fossify.notes.models.Widget
+import org.fossify.notes.services.WidgetService
 
 class MyWidgetProvider : AppWidgetProvider() {
     private fun setupAppOpenIntent(context: Context, views: RemoteViews, id: Int, widget: Widget) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt b/app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt
similarity index 89%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt
rename to app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt
index 53fb7227..fd438f73 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt
+++ b/app/src/main/kotlin/org/fossify/notes/helpers/NotesHelper.kt
@@ -1,19 +1,19 @@
-package com.simplemobiletools.notes.pro.helpers
+package org.fossify.notes.helpers
 
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.commons.helpers.ExportResult
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.R
-import com.simplemobiletools.notes.pro.extensions.config
-import com.simplemobiletools.notes.pro.extensions.notesDB
-import com.simplemobiletools.notes.pro.models.Note
-import com.simplemobiletools.notes.pro.models.NoteType
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import org.fossify.commons.activities.BaseSimpleActivity
+import org.fossify.commons.helpers.ExportResult
+import org.fossify.commons.helpers.PROTECTION_NONE
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.R
+import org.fossify.notes.extensions.config
+import org.fossify.notes.extensions.notesDB
+import org.fossify.notes.models.Note
+import org.fossify.notes.models.NoteType
 import java.io.File
 import java.io.OutputStream
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt b/app/src/main/kotlin/org/fossify/notes/interfaces/ChecklistItemsListener.kt
similarity index 68%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt
rename to app/src/main/kotlin/org/fossify/notes/interfaces/ChecklistItemsListener.kt
index 01766222..6e31739e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/ChecklistItemsListener.kt
+++ b/app/src/main/kotlin/org/fossify/notes/interfaces/ChecklistItemsListener.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.interfaces
+package org.fossify.notes.interfaces
 
 interface ChecklistItemsListener {
     fun refreshItems()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt b/app/src/main/kotlin/org/fossify/notes/interfaces/NotesDao.kt
similarity index 89%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt
rename to app/src/main/kotlin/org/fossify/notes/interfaces/NotesDao.kt
index f8686434..a7e63e47 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/NotesDao.kt
+++ b/app/src/main/kotlin/org/fossify/notes/interfaces/NotesDao.kt
@@ -1,7 +1,7 @@
-package com.simplemobiletools.notes.pro.interfaces
+package org.fossify.notes.interfaces
 
 import androidx.room.*
-import com.simplemobiletools.notes.pro.models.Note
+import org.fossify.notes.models.Note
 
 @Dao
 interface NotesDao {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/WidgetsDao.kt b/app/src/main/kotlin/org/fossify/notes/interfaces/WidgetsDao.kt
similarity index 86%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/WidgetsDao.kt
rename to app/src/main/kotlin/org/fossify/notes/interfaces/WidgetsDao.kt
index 8b7dbd30..8bc73179 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/interfaces/WidgetsDao.kt
+++ b/app/src/main/kotlin/org/fossify/notes/interfaces/WidgetsDao.kt
@@ -1,10 +1,10 @@
-package com.simplemobiletools.notes.pro.interfaces
+package org.fossify.notes.interfaces
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.simplemobiletools.notes.pro.models.Widget
+import org.fossify.notes.models.Widget
 
 @Dao
 interface WidgetsDao {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt b/app/src/main/kotlin/org/fossify/notes/models/ChecklistItem.kt
similarity index 72%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt
rename to app/src/main/kotlin/org/fossify/notes/models/ChecklistItem.kt
index fb2437ce..0a41dadf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/ChecklistItem.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/ChecklistItem.kt
@@ -1,9 +1,9 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
-import com.simplemobiletools.commons.helpers.SORT_BY_TITLE
-import com.simplemobiletools.commons.helpers.SORT_DESCENDING
-import com.simplemobiletools.notes.pro.helpers.CollatorBasedComparator
 import kotlinx.serialization.Serializable
+import org.fossify.commons.helpers.SORT_BY_TITLE
+import org.fossify.commons.helpers.SORT_DESCENDING
+import org.fossify.notes.helpers.CollatorBasedComparator
 
 @Serializable
 data class ChecklistItem(
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt b/app/src/main/kotlin/org/fossify/notes/models/Note.kt
similarity index 86%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt
rename to app/src/main/kotlin/org/fossify/notes/models/Note.kt
index 0b010063..da9b7a0e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Note.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/Note.kt
@@ -1,12 +1,12 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
 import android.content.Context
 import android.net.Uri
 import androidx.room.*
-import com.simplemobiletools.commons.extensions.isBiometricIdAvailable
-import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT
-import com.simplemobiletools.commons.helpers.PROTECTION_NONE
 import kotlinx.serialization.Serializable
+import org.fossify.commons.extensions.isBiometricIdAvailable
+import org.fossify.commons.helpers.PROTECTION_FINGERPRINT
+import org.fossify.commons.helpers.PROTECTION_NONE
 import java.io.File
 
 /**
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteType.kt b/app/src/main/kotlin/org/fossify/notes/models/NoteType.kt
similarity index 86%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteType.kt
rename to app/src/main/kotlin/org/fossify/notes/models/NoteType.kt
index d81d693a..ddba6f3e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteType.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/NoteType.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
 import kotlinx.serialization.Serializable
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteTypeConverter.kt b/app/src/main/kotlin/org/fossify/notes/models/NoteTypeConverter.kt
similarity index 85%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteTypeConverter.kt
rename to app/src/main/kotlin/org/fossify/notes/models/NoteTypeConverter.kt
index a2e5b2bb..c66a6759 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/NoteTypeConverter.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/NoteTypeConverter.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
 import androidx.room.TypeConverter
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistory.kt b/app/src/main/kotlin/org/fossify/notes/models/TextHistory.kt
similarity index 90%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistory.kt
rename to app/src/main/kotlin/org/fossify/notes/models/TextHistory.kt
index 3de176e6..152bbb0e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistory.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/TextHistory.kt
@@ -1,6 +1,6 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
-import java.util.*
+import java.util.LinkedList
 
 class TextHistory {
     var position = 0
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistoryItem.kt b/app/src/main/kotlin/org/fossify/notes/models/TextHistoryItem.kt
similarity index 67%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistoryItem.kt
rename to app/src/main/kotlin/org/fossify/notes/models/TextHistoryItem.kt
index 72d7d720..46f28a6b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/TextHistoryItem.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/TextHistoryItem.kt
@@ -1,3 +1,3 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
 data class TextHistoryItem(val start: Int, val before: CharSequence?, val after: CharSequence?)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt b/app/src/main/kotlin/org/fossify/notes/models/Widget.kt
similarity index 92%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt
rename to app/src/main/kotlin/org/fossify/notes/models/Widget.kt
index 996d8414..7eeec60f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt
+++ b/app/src/main/kotlin/org/fossify/notes/models/Widget.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.models
+package org.fossify.notes.models
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/AutomaticBackupReceiver.kt b/app/src/main/kotlin/org/fossify/notes/receivers/AutomaticBackupReceiver.kt
similarity index 82%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/AutomaticBackupReceiver.kt
rename to app/src/main/kotlin/org/fossify/notes/receivers/AutomaticBackupReceiver.kt
index 7d4949be..fde078e0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/AutomaticBackupReceiver.kt
+++ b/app/src/main/kotlin/org/fossify/notes/receivers/AutomaticBackupReceiver.kt
@@ -1,10 +1,10 @@
-package com.simplemobiletools.notes.pro.receivers
+package org.fossify.notes.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.PowerManager
-import com.simplemobiletools.notes.pro.extensions.backupNotes
+import org.fossify.notes.extensions.backupNotes
 
 class AutomaticBackupReceiver : BroadcastReceiver() {
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/BootCompletedReceiver.kt b/app/src/main/kotlin/org/fossify/notes/receivers/BootCompletedReceiver.kt
similarity index 64%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/BootCompletedReceiver.kt
rename to app/src/main/kotlin/org/fossify/notes/receivers/BootCompletedReceiver.kt
index 8cc03250..932b9f9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/receivers/BootCompletedReceiver.kt
+++ b/app/src/main/kotlin/org/fossify/notes/receivers/BootCompletedReceiver.kt
@@ -1,10 +1,10 @@
-package com.simplemobiletools.notes.pro.receivers
+package org.fossify.notes.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.notes.pro.extensions.checkAndBackupNotesOnBoot
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.notes.extensions.checkAndBackupNotesOnBoot
 
 class BootCompletedReceiver : BroadcastReceiver() {
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/services/WidgetService.kt b/app/src/main/kotlin/org/fossify/notes/services/WidgetService.kt
similarity index 65%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/services/WidgetService.kt
rename to app/src/main/kotlin/org/fossify/notes/services/WidgetService.kt
index f313220a..297a08ae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/services/WidgetService.kt
+++ b/app/src/main/kotlin/org/fossify/notes/services/WidgetService.kt
@@ -1,8 +1,8 @@
-package com.simplemobiletools.notes.pro.services
+package org.fossify.notes.services
 
 import android.content.Intent
 import android.widget.RemoteViewsService
-import com.simplemobiletools.notes.pro.adapters.WidgetAdapter
+import org.fossify.notes.adapters.WidgetAdapter
 
 class WidgetService : RemoteViewsService() {
     override fun onGetViewFactory(intent: Intent) = WidgetAdapter(applicationContext, intent)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/views/MyHorizontalScrollView.kt b/app/src/main/kotlin/org/fossify/notes/views/MyHorizontalScrollView.kt
similarity index 91%
rename from app/src/main/kotlin/com/simplemobiletools/notes/pro/views/MyHorizontalScrollView.kt
rename to app/src/main/kotlin/org/fossify/notes/views/MyHorizontalScrollView.kt
index 51383591..4bc01b27 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/views/MyHorizontalScrollView.kt
+++ b/app/src/main/kotlin/org/fossify/notes/views/MyHorizontalScrollView.kt
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes.pro.views
+package org.fossify.notes.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3828eef2..3091fed8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
             android:id="@+id/search_wrapper"
             layout="@layout/search_bar" />
 
-        <com.simplemobiletools.commons.views.MyViewPager
+        <org.fossify.commons.views.MyViewPager
             android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -36,6 +36,6 @@
                 android:layout_gravity="top"
                 android:background="@null" />
 
-        </com.simplemobiletools.commons.views.MyViewPager>
+        </org.fossify.commons.views.MyViewPager>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 6ee073d1..4856e43e 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -41,7 +41,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_color_customization_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
@@ -58,7 +58,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_widget_color_customization_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
@@ -86,7 +86,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_use_english"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -101,14 +101,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_language_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/language" />
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_language"
                     style="@style/SettingsTextValueStyle"
                     android:layout_width="wrap_content"
@@ -124,14 +124,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_font_size_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/font_size" />
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_font_size"
                     style="@style/SettingsTextValueStyle"
                     android:layout_width="match_parent"
@@ -158,7 +158,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_show_word_count"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -173,7 +173,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_clickable_links"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -188,7 +188,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_monospaced_font"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -203,7 +203,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_use_incognito_mode"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -218,7 +218,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_enable_line_wrap"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -233,14 +233,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_gravity_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/alignment" />
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_gravity"
                     style="@style/SettingsTextValueStyle"
                     android:layout_width="match_parent"
@@ -267,7 +267,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_cursor_placement"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -282,7 +282,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_show_keyboard"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -297,7 +297,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_show_note_picker"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -323,7 +323,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_autosave_notes"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -338,7 +338,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_display_success"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -364,7 +364,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_export_notes_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="match_parent"
@@ -378,12 +378,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_import_notes_label"
-                style="@style/SettingsTextLabelStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/import_notes" />
+                <org.fossify.commons.views.MyTextView
+                    android:id="@+id/settings_import_notes_label"
+                    style="@style/SettingsTextLabelStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/import_notes" />
             </RelativeLayout>
 
             <include
@@ -403,7 +403,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/settings_enable_automatic_backups"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
@@ -418,7 +418,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <com.simplemobiletools.commons.views.MyTextView
+                <org.fossify.commons.views.MyTextView
                     android:id="@+id/settings_manage_automatic_backups"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/datetime_pattern_info_layout.xml b/app/src/main/res/layout/datetime_pattern_info_layout.xml
index 36ee34d1..fc25c3a1 100644
--- a/app/src/main/res/layout/datetime_pattern_info_layout.xml
+++ b/app/src/main/res/layout/datetime_pattern_info_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.commons.views.MyTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.fossify.commons.views.MyTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/date_time_pattern_info"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_delete_note.xml b/app/src/main/res/layout/dialog_delete_note.xml
index f669a63f..ec402721 100644
--- a/app/src/main/res/layout/dialog_delete_note.xml
+++ b/app/src/main/res/layout/dialog_delete_note.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/delete_note_description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
         android:padding="@dimen/activity_margin"
         android:visibility="gone">
 
-        <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+        <org.fossify.commons.views.MyAppCompatCheckbox
             android:id="@+id/delete_note_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_export_file.xml b/app/src/main/res/layout/dialog_export_file.xml
index c3fd9b9d..d45c5ff5 100644
--- a/app/src/main/res/layout/dialog_export_file.xml
+++ b/app/src/main/res/layout/dialog_export_file.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/file_path_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,9 +19,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/file_name_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -37,9 +37,9 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/bigger_text_size" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/extension_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -53,5 +53,5 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/bigger_text_size" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_export_files.xml b/app/src/main/res/layout/dialog_export_files.xml
index fe95dd23..ca90e168 100644
--- a/app/src/main/res/layout/dialog_export_files.xml
+++ b/app/src/main/res/layout/dialog_export_files.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/folder_path_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,9 +19,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/extension_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -35,5 +35,5 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/bigger_text_size" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_export_notes.xml b/app/src/main/res/layout/dialog_export_notes.xml
index 7e354d38..d203173d 100644
--- a/app/src/main/res/layout/dialog_export_notes.xml
+++ b/app/src/main/res/layout/dialog_export_notes.xml
@@ -11,7 +11,7 @@
         android:orientation="vertical"
         android:paddingTop="@dimen/activity_margin">
 
-        <com.simplemobiletools.commons.views.MyTextInputLayout
+        <org.fossify.commons.views.MyTextInputLayout
             android:id="@+id/export_notes_filename_hint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
                 android:textCursorDrawable="@null"
                 android:textSize="@dimen/bigger_text_size" />
 
-        </com.simplemobiletools.commons.views.MyTextInputLayout>
+        </org.fossify.commons.views.MyTextInputLayout>
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_import_folder.xml b/app/src/main/res/layout/dialog_import_folder.xml
index 8475f95f..e6d1c384 100644
--- a/app/src/main/res/layout/dialog_import_folder.xml
+++ b/app/src/main/res/layout/dialog_import_folder.xml
@@ -8,7 +8,7 @@
     android:paddingTop="@dimen/activity_margin"
     android:paddingEnd="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/open_file_filename_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,14 +21,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 
     <RadioGroup
         android:id="@+id/open_file_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/open_file_update_file"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             android:paddingBottom="@dimen/activity_margin"
             android:text="@string/update_file_at_note" />
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/open_file_content_only"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_manage_automatic_backups.xml b/app/src/main/res/layout/dialog_manage_automatic_backups.xml
index 9aef64b4..11ce0aec 100644
--- a/app/src/main/res/layout/dialog_manage_automatic_backups.xml
+++ b/app/src/main/res/layout/dialog_manage_automatic_backups.xml
@@ -12,7 +12,7 @@
         android:orientation="vertical"
         android:paddingTop="@dimen/activity_margin">
 
-        <com.simplemobiletools.commons.views.MyTextInputLayout
+        <org.fossify.commons.views.MyTextInputLayout
             android:id="@+id/backup_notes_folder_hint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -27,9 +27,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-        </com.simplemobiletools.commons.views.MyTextInputLayout>
+        </org.fossify.commons.views.MyTextInputLayout>
 
-        <com.simplemobiletools.commons.views.MyTextInputLayout
+        <org.fossify.commons.views.MyTextInputLayout
             android:id="@+id/backup_notes_filename_hint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
                 android:textCursorDrawable="@null"
                 android:textSize="@dimen/bigger_text_size" />
 
-        </com.simplemobiletools.commons.views.MyTextInputLayout>
+        </org.fossify.commons.views.MyTextInputLayout>
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml
index 8a97d254..20e184a5 100644
--- a/app/src/main/res/layout/dialog_new_checklist_item.xml
+++ b/app/src/main/res/layout/dialog_new_checklist_item.xml
@@ -32,7 +32,7 @@
             android:paddingBottom="@dimen/medium_margin"
             android:src="@drawable/ic_plus_vector" />
 
-        <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+        <org.fossify.commons.views.MyAppCompatCheckbox
             android:id="@+id/settings_add_checklist_top"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_new_note.xml b/app/src/main/res/layout/dialog_new_note.xml
index dad5583a..e3444c0f 100644
--- a/app/src/main/res/layout/dialog_new_note.xml
+++ b/app/src/main/res/layout/dialog_new_note.xml
@@ -8,7 +8,7 @@
     android:paddingTop="@dimen/small_margin"
     android:paddingEnd="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/note_title_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -25,9 +25,9 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/bigger_text_size" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/new_note_type_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/type_text_note"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
             android:paddingBottom="@dimen/normal_margin"
             android:text="@string/text_note" />
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/type_checklist"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_open_file.xml b/app/src/main/res/layout/dialog_open_file.xml
index df42f3fc..18236612 100644
--- a/app/src/main/res/layout/dialog_open_file.xml
+++ b/app/src/main/res/layout/dialog_open_file.xml
@@ -8,7 +8,7 @@
     android:paddingTop="@dimen/activity_margin"
     android:paddingEnd="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/open_file_filename_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,14 +21,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 
     <RadioGroup
         android:id="@+id/open_file_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/open_file_update_file"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
             android:paddingBottom="@dimen/normal_margin"
             android:text="@string/update_file_at_note" />
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/open_file_content_only"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_open_note.xml b/app/src/main/res/layout/dialog_open_note.xml
index 6abdb101..4d5de947 100644
--- a/app/src/main/res/layout/dialog_open_note.xml
+++ b/app/src/main/res/layout/dialog_open_note.xml
@@ -15,17 +15,17 @@
         android:minHeight="@dimen/min_open_note_popup_height"
         app:layout_constraintHeight_max="@dimen/max_open_note_popup_height">
 
-        <com.simplemobiletools.commons.views.MyRecyclerView
+        <org.fossify.commons.views.MyRecyclerView
             android:id="@+id/dialog_open_note_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:itemCount="10"
             android:paddingBottom="@dimen/open_note_popup_bottom_extra_padding"
+            tools:itemCount="10"
             tools:listitem="@layout/open_note_item" />
 
     </androidx.core.widget.NestedScrollView>
 
-    <com.simplemobiletools.commons.views.MyFloatingActionButton
+    <org.fossify.commons.views.MyFloatingActionButton
         android:id="@+id/new_note_fab"
         android:layout_width="@dimen/fab_size"
         android:layout_height="@dimen/fab_size"
diff --git a/app/src/main/res/layout/dialog_rename_checklist_item.xml b/app/src/main/res/layout/dialog_rename_checklist_item.xml
index 4bc1ae03..6499769b 100644
--- a/app/src/main/res/layout/dialog_rename_checklist_item.xml
+++ b/app/src/main/res/layout/dialog_rename_checklist_item.xml
@@ -8,7 +8,7 @@
     android:paddingTop="@dimen/activity_margin"
     android:paddingEnd="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/checklist_item_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -24,5 +24,5 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/bigger_text_size" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_rename_note.xml b/app/src/main/res/layout/dialog_rename_note.xml
index 7e9bb395..09358cae 100644
--- a/app/src/main/res/layout/dialog_rename_note.xml
+++ b/app/src/main/res/layout/dialog_rename_note.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:padding="@dimen/activity_margin">
 
-    <com.simplemobiletools.commons.views.MyTextInputLayout
+    <org.fossify.commons.views.MyTextInputLayout
         android:id="@+id/note_title_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -22,5 +22,5 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/bigger_text_size" />
 
-    </com.simplemobiletools.commons.views.MyTextInputLayout>
+    </org.fossify.commons.views.MyTextInputLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_sort_checklist.xml b/app/src/main/res/layout/dialog_sort_checklist.xml
index 62733ba7..70e59856 100644
--- a/app/src/main/res/layout/dialog_sort_checklist.xml
+++ b/app/src/main/res/layout/dialog_sort_checklist.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/medium_margin">
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/sorting_dialog_radio_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             android:paddingBottom="@dimen/normal_margin"
             android:text="@string/title" />
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/sorting_dialog_radio_date_created"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
             android:paddingBottom="@dimen/normal_margin"
             android:text="@string/date_created" />
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/sorting_dialog_radio_custom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
         android:layout_marginTop="@dimen/medium_margin"
         android:layout_marginBottom="@dimen/medium_margin">
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/sorting_dialog_radio_ascending"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
             android:paddingBottom="@dimen/normal_margin"
             android:text="@string/ascending" />
 
-        <com.simplemobiletools.commons.views.MyCompatRadioButton
+        <org.fossify.commons.views.MyCompatRadioButton
             android:id="@+id/sorting_dialog_radio_descending"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
         android:paddingTop="@dimen/medium_margin"
         android:paddingBottom="@dimen/medium_margin">
 
-        <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+        <org.fossify.commons.views.MyAppCompatCheckbox
             android:id="@+id/settings_move_undone_checklist_items"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_unlock_notes.xml b/app/src/main/res/layout/dialog_unlock_notes.xml
index c0ac82de..6dc82c9e 100644
--- a/app/src/main/res/layout/dialog_unlock_notes.xml
+++ b/app/src/main/res/layout/dialog_unlock_notes.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <com.simplemobiletools.commons.views.MyTextView
+        <org.fossify.commons.views.MyTextView
             android:id="@+id/found_locked_notes_info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_checklist.xml b/app/src/main/res/layout/fragment_checklist.xml
index 3922343c..91e813cc 100644
--- a/app/src/main/res/layout/fragment_checklist.xml
+++ b/app/src/main/res/layout/fragment_checklist.xml
@@ -25,7 +25,7 @@
                 android:layout_marginTop="@dimen/activity_margin"
                 android:src="@drawable/ic_lock_vector" />
 
-            <com.simplemobiletools.commons.views.MyTextView
+            <org.fossify.commons.views.MyTextView
                 android:id="@+id/note_locked_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <com.simplemobiletools.commons.views.MyRecyclerView
+            <org.fossify.commons.views.MyRecyclerView
                 android:id="@+id/checklist_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -63,9 +63,9 @@
                 android:overScrollMode="never"
                 android:paddingBottom="@dimen/secondary_fab_bottom_margin"
                 android:visibility="gone"
-                app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+                app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" />
 
-            <com.simplemobiletools.commons.views.MyTextView
+            <org.fossify.commons.views.MyTextView
                 android:id="@+id/fragment_placeholder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                 android:textStyle="italic"
                 android:visibility="gone" />
 
-            <com.simplemobiletools.commons.views.MyTextView
+            <org.fossify.commons.views.MyTextView
                 android:id="@+id/fragment_placeholder_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
         </RelativeLayout>
     </RelativeLayout>
 
-    <com.simplemobiletools.commons.views.MyFloatingActionButton
+    <org.fossify.commons.views.MyFloatingActionButton
         android:id="@+id/checklist_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_text.xml b/app/src/main/res/layout/fragment_text.xml
index 208f8464..8b6b4714 100644
--- a/app/src/main/res/layout/fragment_text.xml
+++ b/app/src/main/res/layout/fragment_text.xml
@@ -20,7 +20,7 @@
             android:layout_marginTop="@dimen/activity_margin"
             android:src="@drawable/ic_lock_vector" />
 
-        <com.simplemobiletools.commons.views.MyTextView
+        <org.fossify.commons.views.MyTextView
             android:id="@+id/note_locked_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
 
     </ScrollView>
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/notes_counter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_add_checklist.xml b/app/src/main/res/layout/item_add_checklist.xml
index 4dfd72db..2a57027c 100644
--- a/app/src/main/res/layout/item_add_checklist.xml
+++ b/app/src/main/res/layout/item_add_checklist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.commons.views.MyEditText xmlns:android="http://schemas.android.com/apk/res/android"
+<org.fossify.commons.views.MyEditText xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/title_edit_text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_checklist.xml b/app/src/main/res/layout/item_checklist.xml
index 25f1bc99..73840d24 100644
--- a/app/src/main/res/layout/item_checklist.xml
+++ b/app/src/main/res/layout/item_checklist.xml
@@ -11,7 +11,7 @@
     android:foreground="@drawable/selector"
     android:paddingEnd="@dimen/normal_margin">
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/checklist_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_locked_note.xml b/app/src/main/res/layout/item_locked_note.xml
index e77ae12b..19f054a8 100644
--- a/app/src/main/res/layout/item_locked_note.xml
+++ b/app/src/main/res/layout/item_locked_note.xml
@@ -10,7 +10,7 @@
     android:focusable="true"
     android:paddingHorizontal="@dimen/normal_margin">
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/locked_note_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/note_view_horiz_scrollable.xml b/app/src/main/res/layout/note_view_horiz_scrollable.xml
index 9a7ca54e..df1560b7 100644
--- a/app/src/main/res/layout/note_view_horiz_scrollable.xml
+++ b/app/src/main/res/layout/note_view_horiz_scrollable.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.notes.pro.views.MyHorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.fossify.notes.views.MyHorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/notes_horizontal_scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarSize="5dp"
     android:scrollbars="horizontal">
 
-    <com.simplemobiletools.commons.views.MyEditText
+    <org.fossify.commons.views.MyEditText
         android:id="@+id/text_note_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -19,4 +19,4 @@
         android:scrollbars="vertical"
         android:textCursorDrawable="@null" />
 
-</com.simplemobiletools.notes.pro.views.MyHorizontalScrollView>
+</org.fossify.notes.views.MyHorizontalScrollView>
diff --git a/app/src/main/res/layout/note_view_static.xml b/app/src/main/res/layout/note_view_static.xml
index dc24e716..ba707d13 100644
--- a/app/src/main/res/layout/note_view_static.xml
+++ b/app/src/main/res/layout/note_view_static.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.commons.views.MyEditText xmlns:android="http://schemas.android.com/apk/res/android"
+<org.fossify.commons.views.MyEditText xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_note_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/open_note_item.xml b/app/src/main/res/layout/open_note_item.xml
index 0e22322a..e8d18e9b 100644
--- a/app/src/main/res/layout/open_note_item.xml
+++ b/app/src/main/res/layout/open_note_item.xml
@@ -19,7 +19,7 @@
         android:src="@drawable/ic_lock_vector"
         android:visibility="gone" />
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/open_note_item_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
         android:textStyle="bold"
         tools:text="Title" />
 
-    <com.simplemobiletools.commons.views.MyTextView
+    <org.fossify.commons.views.MyTextView
         android:id="@+id/open_note_item_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml
index e5f3b8f0..d1df3c23 100644
--- a/app/src/main/res/layout/widget_config.xml
+++ b/app/src/main/res/layout/widget_config.xml
@@ -25,7 +25,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:padding="@dimen/activity_margin">
 
-                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                <org.fossify.commons.views.MyAppCompatCheckbox
                     android:id="@+id/show_note_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
 
             </RelativeLayout>
 
-            <com.simplemobiletools.commons.views.MyTextView
+            <org.fossify.commons.views.MyTextView
                 android:id="@+id/notes_picker_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
                 android:paddingStart="@dimen/activity_margin"
                 android:text="@string/note_shown_widget" />
 
-            <com.simplemobiletools.commons.views.MyTextView
+            <org.fossify.commons.views.MyTextView
                 android:id="@+id/notes_picker_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
 
         </RelativeLayout>
 
-        <com.simplemobiletools.commons.views.MyTextView
+        <org.fossify.commons.views.MyTextView
             android:id="@+id/text_note_view_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
             android:padding="@dimen/activity_margin"
             android:text="@string/widget_config" />
 
-        <com.simplemobiletools.commons.views.MyRecyclerView
+        <org.fossify.commons.views.MyRecyclerView
             android:id="@+id/checklist_note_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -95,7 +95,7 @@
             android:overScrollMode="never"
             android:paddingTop="@dimen/small_margin"
             android:visibility="gone"
-            app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+            app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" />
 
         <ImageView
             android:id="@+id/config_bg_color"
@@ -114,7 +114,7 @@
             android:layout_toEndOf="@+id/config_bg_color"
             android:background="@drawable/widget_config_seekbar_background">
 
-            <com.simplemobiletools.commons.views.MySeekBar
+            <org.fossify.commons.views.MySeekBar
                 android:id="@+id/config_bg_seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index a16363d9..8c246b1b 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="com.simplemobiletools.notes.pro.activities.WidgetConfigureActivity"
+    android:configure="org.fossify.notes.activities.WidgetConfigureActivity"
     android:initialLayout="@layout/widget"
     android:minWidth="110dp"
     android:minHeight="110dp"
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 7fdffeb6..0b95c556 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +1,2 @@
 json_key_file("fastlane/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("com.simplemobiletools.notes.pro") # e.g. com.krausefx.app
+package_name("org.fossify.notes") # e.g. com.krausefx.app
diff --git a/gradle.properties b/gradle.properties
index b2d106ed..f548eabe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 android.enableJetifier=true
 android.useAndroidX=true
 android.nonTransitiveRClass=true
+org.gradle.jvmargs=-Xmx8g
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e5055a3c..ef3c7161 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ app-build-minimumSDK = "23"
 app-build-javaVersion = "VERSION_17"
 app-build-kotlinJVMTarget = "17"
 #versioning
-app-version-appId = "com.simplemobiletools.notes.pro"
+app-version-appId = "org.fossify.notes"
 app-version-versionCode = "1"
 app-version-versionName = "1.0.0"
 [libraries]