Move database elements in packages

app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt

@@ -39,7 +39,7 @@ import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.lock.LockingHideActivity
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt

@@ -34,6 +34,8 @@ import com.kunzisoft.keepass.activities.dialogs.GeneratePasswordDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.IconPickerDialogFragment
 import com.kunzisoft.keepass.activities.lock.LockingHideActivity
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.education.EntryEditActivityEducation
 import com.kunzisoft.keepass.notifications.ClipboardEntryNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_ENTRY_TASK

app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt

@@ -50,6 +50,10 @@ import com.kunzisoft.keepass.adapters.SearchEntryCursorAdapter
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.SortNodeEnum
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.education.GroupActivityEducation
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.magikeyboard.MagikIME

app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt

@@ -20,14 +20,14 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.adapters.NodeAdapter
 import com.kunzisoft.keepass.database.SortNodeEnum
 import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.activities.dialogs.SortDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Type
+import com.kunzisoft.keepass.database.element.node.Type
 import java.util.*
 
 class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt

@@ -26,7 +26,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getBundleFromListNodes
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.getListNodesFromBundle

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt

@@ -34,7 +34,7 @@ import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGrou
 import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.UPDATE
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 
 class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconPickerListener {

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt

@@ -35,7 +35,7 @@ import android.widget.GridView
 import android.widget.ImageView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.database.element.IconImageStandard
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import com.kunzisoft.keepass.icons.IconPack
 import com.kunzisoft.keepass.icons.IconPackChooser
 

app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt

@@ -36,6 +36,8 @@ import androidx.recyclerview.widget.SortedListAdapterCallback
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.SortNodeEnum
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import java.util.*

app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.kt

@@ -31,7 +31,7 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.cursor.EntryCursor
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import java.util.*

app/src/main/java/com/kunzisoft/keepass/crypto/engine/AesEngine.kt

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.crypto.engine
 
 
 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException

app/src/main/java/com/kunzisoft/keepass/crypto/engine/ChaCha20Engine.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.crypto.engine
 
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils
 import org.spongycastle.jce.provider.BouncyCastleProvider
 import java.security.InvalidAlgorithmParameterException

app/src/main/java/com/kunzisoft/keepass/crypto/engine/CipherEngine.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.crypto.engine
 
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 
 import java.security.InvalidAlgorithmParameterException
 import java.security.InvalidKeyException

app/src/main/java/com/kunzisoft/keepass/crypto/engine/TwofishEngine.kt

@@ -20,7 +20,7 @@
 package com.kunzisoft.keepass.crypto.engine
 
 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils
 
 import java.security.InvalidAlgorithmParameterException

app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.kt

@@ -22,8 +22,8 @@ package com.kunzisoft.keepass.database
 
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.Node
-import com.kunzisoft.keepass.database.element.Type
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.Type
 import java.util.*
 
 enum class SortNodeEnum {

app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDialogThread.kt

@@ -11,6 +11,11 @@ import androidx.fragment.app.FragmentActivity
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.Type
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_PASSWORD_TASK
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK

app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database.action
 
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 
 class UpdateCompressionBinariesDatabaseRunnable (
         context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/node/AddEntryRunnable.kt

@@ -23,7 +23,7 @@ import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 
 class AddEntryRunnable constructor(
         context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/node/AddGroupRunnable.kt

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.database.action.node
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 
 class AddGroupRunnable constructor(
         context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/node/AfterActionNodesFinish.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.action.node
 
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 import com.kunzisoft.keepass.tasks.ActionRunnable
 
 /**

app/src/main/java/com/kunzisoft/keepass/database/action/node/CopyNodesRunnable.kt

@@ -22,6 +22,8 @@ package com.kunzisoft.keepass.database.action.node
 import android.content.Context
 import android.util.Log
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.exception.CopyEntryDatabaseException
 import com.kunzisoft.keepass.database.exception.CopyGroupDatabaseException
 

app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteNodesRunnable.kt

@@ -21,6 +21,8 @@ package com.kunzisoft.keepass.database.action.node
 
 import android.content.Context
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.Type
 
 class DeleteNodesRunnable(context: Context,
                           database: Database,

app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveNodesRunnable.kt

@@ -22,6 +22,8 @@ package com.kunzisoft.keepass.database.action.node
 import android.content.Context
 import android.util.Log
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.exception.EntryDatabaseException
 import com.kunzisoft.keepass.database.exception.MoveGroupDatabaseException
 

app/src/main/java/com/kunzisoft/keepass/database/action/node/NodeHandler.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database
+package com.kunzisoft.keepass.database.action.node
 
 
 /** "Delegate" class for operating on each group when traversing all of

app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateEntryRunnable.kt

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.database.action.node
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 
 class UpdateEntryRunnable constructor(
         context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateGroupRunnable.kt

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.database.action.node
 import android.content.Context
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Group
-import com.kunzisoft.keepass.database.element.Node
+import com.kunzisoft.keepass.database.element.node.Node
 
 class UpdateGroupRunnable constructor(
         context: Context,

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.kt

@@ -2,9 +2,9 @@ package com.kunzisoft.keepass.database.cursor
 
 import android.database.MatrixCursor
 import android.provider.BaseColumns
-import com.kunzisoft.keepass.database.element.EntryVersioned
-import com.kunzisoft.keepass.database.element.IconImageFactory
-import com.kunzisoft.keepass.database.element.NodeId
+import com.kunzisoft.keepass.database.element.entry.EntryVersioned
+import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.element.node.NodeId
 
 abstract class EntryCursor<EntryId, PwEntryV : EntryVersioned<*, EntryId, *, *>> : MatrixCursor(arrayOf(
         _ID,

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDB.kt

@@ -1,7 +1,7 @@
 package com.kunzisoft.keepass.database.cursor
 
-import com.kunzisoft.keepass.database.element.DatabaseVersioned
-import com.kunzisoft.keepass.database.element.EntryKDB
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
 
 class EntryCursorKDB : EntryCursorUUID<EntryKDB>() {
 

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorKDBX.kt

@@ -1,7 +1,7 @@
 package com.kunzisoft.keepass.database.cursor
 
-import com.kunzisoft.keepass.database.element.EntryKDBX
-import com.kunzisoft.keepass.database.element.IconImageFactory
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageFactory
 
 import java.util.UUID
 

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursorUUID.kt

@@ -1,8 +1,8 @@
 package com.kunzisoft.keepass.database.cursor
 
-import com.kunzisoft.keepass.database.element.EntryVersioned
-import com.kunzisoft.keepass.database.element.NodeId
-import com.kunzisoft.keepass.database.element.NodeIdUUID
+import com.kunzisoft.keepass.database.element.entry.EntryVersioned
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import java.util.*
 
 abstract class EntryCursorUUID<EntryV: EntryVersioned<*, UUID, *, *>>: EntryCursor<UUID, EntryV>() {

app/src/main/java/com/kunzisoft/keepass/database/cursor/ExtraFieldCursor.kt

@@ -3,7 +3,7 @@ package com.kunzisoft.keepass.database.cursor
 import android.database.MatrixCursor
 import android.provider.BaseColumns
 
-import com.kunzisoft.keepass.database.element.EntryKDBX
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 
 class ExtraFieldCursor : MatrixCursor(arrayOf(

app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt

@@ -25,9 +25,17 @@ import android.database.Cursor
 import android.net.Uri
 import android.util.Log
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
-import com.kunzisoft.keepass.database.NodeHandler
+import com.kunzisoft.keepass.database.action.node.NodeHandler
 import com.kunzisoft.keepass.database.cursor.EntryCursorKDB
 import com.kunzisoft.keepass.database.cursor.EntryCursorKDBX
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.DatabaseKDB
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdInt
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
@@ -35,7 +43,7 @@ import com.kunzisoft.keepass.database.file.input.DatabaseInputKDB
 import com.kunzisoft.keepass.database.file.input.DatabaseInputKDBX
 import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDB
 import com.kunzisoft.keepass.database.file.output.DatabaseOutputKDBX
-import com.kunzisoft.keepass.database.search.SearchDbHelper
+import com.kunzisoft.keepass.database.search.SearchHelper
 import com.kunzisoft.keepass.icons.IconDrawableFactory
 import com.kunzisoft.keepass.stream.LEDataInputStream
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
@@ -55,7 +63,7 @@ class Database {
     var fileUri: Uri? = null
         private set
 
-    private var mSearchHelper: SearchDbHelper? = null
+    private var mSearchHelper: SearchHelper? = null
 
     var isReadOnly = false
 
@@ -374,7 +382,7 @@ class Database {
             else -> throw SignatureDatabaseException()
         }
 
-        this.mSearchHelper = SearchDbHelper(omitBackup)
+        this.mSearchHelper = SearchHelper(omitBackup)
         loaded = true
     }
 
@@ -399,7 +407,7 @@ class Database {
         if (mDatabaseKDBX != null)
             cursorKDBX = EntryCursorKDBX()
 
-        val searchResult = search(query, SearchDbHelper.MAX_SEARCH_ENTRY)
+        val searchResult = search(query, SearchHelper.MAX_SEARCH_ENTRY)
         if (searchResult != null) {
             for (entry in searchResult.getChildEntries(true)) {
                 entry.entryKDB?.let {

app/src/main/java/com/kunzisoft/keepass/database/element/DeletedObject.kt

@@ -19,6 +19,7 @@
  */
 package com.kunzisoft.keepass.database.element
 
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 import java.util.Date
 import java.util.UUID
 

app/src/main/java/com/kunzisoft/keepass/database/element/Entry.kt

@@ -2,6 +2,17 @@ package com.kunzisoft.keepass.database.element
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.entry.EntryVersionedInterface
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.Field

app/src/main/java/com/kunzisoft/keepass/database/element/Group.kt

@@ -2,6 +2,12 @@ package com.kunzisoft.keepass.database.element
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.group.GroupKDB
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.group.GroupVersionedInterface
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.node.*
 import java.util.*
 import kotlin.collections.ArrayList
 

app/src/main/java/com/kunzisoft/keepass/database/element/database/BinaryPool.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.database
 
 import android.util.SparseArray
 import com.kunzisoft.keepass.database.element.security.BinaryAttachment

app/src/main/java/com/kunzisoft/keepass/database/element/database/CompressionAlgorithm.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.database
 
 import android.content.res.Resources
 import android.os.Parcel

app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt

@@ -17,11 +17,17 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.database
 
 import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
+import com.kunzisoft.keepass.database.element.group.GroupKDB
+import com.kunzisoft.keepass.database.element.node.NodeIdInt
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeVersioned
 import com.kunzisoft.keepass.stream.NullOutputStream
 import java.io.IOException
 import java.io.InputStream

app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.database
 
 import android.content.res.Resources
 import android.util.Base64
@@ -29,7 +29,15 @@ import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
-import com.kunzisoft.keepass.database.element.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE
+import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.database.DatabaseKDB.Companion.BACKUP_FOLDER_TITLE
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeVersioned
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.exception.UnknownKDF
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_3
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX.Companion.FILE_VERSION_32_4

app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseVersioned.kt

@@ -17,9 +17,15 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.database
 
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.entry.EntryVersioned
+import com.kunzisoft.keepass.database.element.group.GroupVersioned
+import com.kunzisoft.keepass.database.element.icon.IconImageFactory
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
 import com.kunzisoft.keepass.database.exception.KeyFileEmptyDatabaseException
 import org.apache.commons.io.IOUtils

app/src/main/java/com/kunzisoft/keepass/database/element/entry/AutoType.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt

@@ -17,10 +17,15 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.group.GroupKDB
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeKDBInterface
+import com.kunzisoft.keepass.database.element.node.Type
 import java.util.*
 
 /**

app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDBX.kt

@@ -17,10 +17,20 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.database.element.security.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.utils.ParcelableUtil

app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryVersioned.kt

@@ -1,6 +1,8 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.entry
 
 import android.os.Parcel
+import com.kunzisoft.keepass.database.element.group.GroupVersioned
+import com.kunzisoft.keepass.database.element.node.NodeVersioned
 
 abstract class EntryVersioned
         <

app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryVersionedInterface.kt

@@ -1,4 +1,6 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.entry
+
+import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 
 interface EntryVersionedInterface<ParentGroup> : NodeVersionedInterface<ParentGroup> {
 

app/src/main/java/com/kunzisoft/keepass/database/element/entry/FieldReferencesEngine.kt

@@ -17,8 +17,10 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.entry
 
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
 import com.kunzisoft.keepass.database.search.EntryKDBXSearchHandler
 import com.kunzisoft.keepass.database.search.SearchParametersKDBX
 import com.kunzisoft.keepass.utils.StringUtil

app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDB.kt

@@ -18,10 +18,15 @@
  *
 */
 
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.group
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdInt
+import com.kunzisoft.keepass.database.element.node.NodeKDBInterface
+import com.kunzisoft.keepass.database.element.node.Type
 import java.util.*
 
 class GroupKDB : GroupVersioned<Int, UUID, GroupKDB, EntryKDB>, NodeKDBInterface {

app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupKDBX.kt

@@ -17,10 +17,20 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.group
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
+import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
+import com.kunzisoft.keepass.database.element.node.Type
 
 import java.util.HashMap
 import java.util.UUID

app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupVersioned.kt

@@ -1,6 +1,8 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.group
 
 import android.os.Parcel
+import com.kunzisoft.keepass.database.element.entry.EntryVersioned
+import com.kunzisoft.keepass.database.element.node.NodeVersioned
 
 abstract class GroupVersioned
         <

app/src/main/java/com/kunzisoft/keepass/database/element/group/GroupVersionedInterface.kt

@@ -1,6 +1,7 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.group
 
-import com.kunzisoft.keepass.database.NodeHandler
+import com.kunzisoft.keepass.database.action.node.NodeHandler
+import com.kunzisoft.keepass.database.element.node.NodeVersionedInterface
 
 interface GroupVersionedInterface<Group: GroupVersionedInterface<Group, Entry>, Entry> : NodeVersionedInterface<Group> {
 

app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.icon
 
 import android.os.Parcelable
 

app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt

@@ -17,10 +17,11 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.icon
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 
 import java.util.UUID
 

app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageFactory.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.icon
 
 import org.apache.commons.collections.map.AbstractReferenceMap
 import org.apache.commons.collections.map.ReferenceMap

app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.icon
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/java/com/kunzisoft/keepass/database/element/node/Node.kt

@@ -1,4 +1,6 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
+
+import com.kunzisoft.keepass.database.element.Group
 
 interface Node: NodeVersionedInterface<Group> {
 

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeId.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeIdInt.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeIdUUID.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeKDBInterface.kt

@@ -1,5 +1,6 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
 
+import com.kunzisoft.keepass.database.element.DateInstant
 import org.joda.time.LocalDateTime
 
 interface NodeKDBInterface : NodeTimeInterface {

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeKDBXInterface.kt

@@ -17,7 +17,9 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
+
+import com.kunzisoft.keepass.database.element.DateInstant
 
 interface NodeKDBXInterface : NodeTimeInterface {
 

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeTimeInterface.kt

@@ -17,7 +17,9 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
+
+import com.kunzisoft.keepass.database.element.DateInstant
 
 interface NodeTimeInterface {
 

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeVersioned.kt

@@ -18,10 +18,15 @@
  *
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.entry.EntryVersionedInterface
+import com.kunzisoft.keepass.database.element.group.GroupVersionedInterface
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import org.joda.time.LocalDateTime
 
 /**

app/src/main/java/com/kunzisoft/keepass/database/element/node/NodeVersionedInterface.kt

@@ -1,6 +1,7 @@
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.node
 
 import android.os.Parcelable
+import com.kunzisoft.keepass.database.element.icon.IconImage
 
 interface NodeVersionedInterface<ParentGroup> : NodeTimeInterface, Parcelable {
 

app/src/main/java/com/kunzisoft/keepass/database/element/security/BinaryAttachment.kt

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database.element.security
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.kunzisoft.keepass.database.element.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
 import com.kunzisoft.keepass.stream.ReadBytes
 import com.kunzisoft.keepass.stream.readFromStream
 import java.io.*

app/src/main/java/com/kunzisoft/keepass/database/element/security/EncryptionAlgorithm.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.security
 
 import android.content.res.Resources
 

app/src/main/java/com/kunzisoft/keepass/database/element/security/MemoryProtectionConfig.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.element.security
 
 class MemoryProtectionConfig {
 

app/src/main/java/com/kunzisoft/keepass/database/exception/DatabaseException.kt

@@ -3,8 +3,8 @@ package com.kunzisoft.keepass.database.exception
 import android.content.res.Resources
 import androidx.annotation.StringRes
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.NodeId
-import com.kunzisoft.keepass.database.element.Type
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.Type
 
 abstract class DatabaseException : Exception {
 

app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseHeaderKDBX.kt

@@ -23,8 +23,12 @@ import com.kunzisoft.keepass.crypto.CrsAlgorithm
 import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
-import com.kunzisoft.keepass.database.NodeHandler
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.action.node.NodeHandler
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.exception.VersionDatabaseException
 import com.kunzisoft.keepass.stream.CopyInputStream
 import com.kunzisoft.keepass.stream.HmacBlockStream

app/src/main/java/com/kunzisoft/keepass/database/file/DatabaseKDBXXML.kt

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.element
+package com.kunzisoft.keepass.database.file
 
 import java.text.SimpleDateFormat
 import java.util.*

app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.file.input
 
-import com.kunzisoft.keepass.database.element.DatabaseVersioned
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
 import com.kunzisoft.keepass.database.exception.LoadDatabaseException
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
 import java.io.InputStream

app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt

@@ -48,7 +48,12 @@ package com.kunzisoft.keepass.database.file.input
 import android.util.Log
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.database.DatabaseKDB
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
+import com.kunzisoft.keepass.database.element.group.GroupKDB
+import com.kunzisoft.keepass.database.element.node.NodeIdInt
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DatabaseHeader
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB

app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt

@@ -25,12 +25,21 @@ import com.kunzisoft.keepass.crypto.CipherFactory
 import com.kunzisoft.keepass.crypto.StreamCipherFactory
 import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.database.element.*
-import com.kunzisoft.keepass.database.element.DatabaseKDBX.Companion.BASE_64_FLAG
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BASE_64_FLAG
+import com.kunzisoft.keepass.database.element.database.DatabaseVersioned
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.element.security.BinaryAttachment
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.exception.*
 import com.kunzisoft.keepass.database.file.DateKDBXUtil
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
+import com.kunzisoft.keepass.database.file.DatabaseKDBXXML
 import com.kunzisoft.keepass.stream.*
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseHeaderOutputKDBX.kt

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database.file.output
 
 import com.kunzisoft.keepass.utils.VariantDictionary
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters
-import com.kunzisoft.keepass.database.element.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
 import com.kunzisoft.keepass.database.file.DatabaseHeader
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
 import com.kunzisoft.keepass.database.exception.DatabaseOutputException

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseInnerHeaderOutputKDBX.kt

@@ -19,8 +19,8 @@
  */
 package com.kunzisoft.keepass.database.file.output
 
-import com.kunzisoft.keepass.database.element.DatabaseKDBX
-import com.kunzisoft.keepass.database.element.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
 import com.kunzisoft.keepass.stream.ReadBytes
 import com.kunzisoft.keepass.stream.LEDataOutputStream

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDB.kt

@@ -20,9 +20,9 @@
 package com.kunzisoft.keepass.database.file.output
 
 import com.kunzisoft.keepass.crypto.CipherFactory
-import com.kunzisoft.keepass.database.element.DatabaseKDB
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
-import com.kunzisoft.keepass.database.element.GroupKDB
+import com.kunzisoft.keepass.database.element.database.DatabaseKDB
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.group.GroupKDB
 import com.kunzisoft.keepass.database.exception.DatabaseOutputException
 import com.kunzisoft.keepass.database.file.DatabaseHeader
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB

app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt

@@ -27,15 +27,24 @@ import com.kunzisoft.keepass.crypto.CrsAlgorithm
 import com.kunzisoft.keepass.crypto.StreamCipherFactory
 import com.kunzisoft.keepass.crypto.engine.CipherEngine
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory
-import com.kunzisoft.keepass.database.NodeHandler
+import com.kunzisoft.keepass.database.action.node.NodeHandler
 import com.kunzisoft.keepass.database.element.*
-import com.kunzisoft.keepass.database.element.DatabaseKDBX.Companion.BASE_64_FLAG
-import com.kunzisoft.keepass.database.element.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BASE_64_FLAG
+import com.kunzisoft.keepass.database.element.database.DatabaseKDBX.Companion.BUFFER_SIZE_BYTES
+import com.kunzisoft.keepass.database.element.entry.AutoType
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
+import com.kunzisoft.keepass.database.element.group.GroupKDBX
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.node.NodeKDBXInterface
 import com.kunzisoft.keepass.database.element.security.BinaryAttachment
+import com.kunzisoft.keepass.database.element.security.MemoryProtectionConfig
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.database.exception.DatabaseOutputException
 import com.kunzisoft.keepass.database.exception.UnknownKDF
 import com.kunzisoft.keepass.database.file.DatabaseHeaderKDBX
+import com.kunzisoft.keepass.database.file.DatabaseKDBXXML
 import com.kunzisoft.keepass.database.file.DateKDBXUtil
 import com.kunzisoft.keepass.stream.*
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils

app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.file.output
 
-import com.kunzisoft.keepass.database.element.EntryKDB
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.stream.LEDataOutputStream
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils
 

app/src/main/java/com/kunzisoft/keepass/database/file/output/GroupOutputKDB.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.file.output
 
-import com.kunzisoft.keepass.database.element.GroupKDB
+import com.kunzisoft.keepass.database.element.group.GroupKDB
 import com.kunzisoft.keepass.stream.LEDataOutputStream
 import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils
 

app/src/main/java/com/kunzisoft/keepass/database/search/EntryKDBXSearchHandler.kt

@@ -19,8 +19,8 @@
  */
 package com.kunzisoft.keepass.database.search
 
-import com.kunzisoft.keepass.database.NodeHandler
-import com.kunzisoft.keepass.database.element.EntryKDBX
+import com.kunzisoft.keepass.database.action.node.NodeHandler
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorKDBX
 import com.kunzisoft.keepass.utils.StringUtil
 

app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.search
 
-import com.kunzisoft.keepass.database.NodeHandler
+import com.kunzisoft.keepass.database.action.node.NodeHandler
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Entry
 import com.kunzisoft.keepass.database.element.Group
@@ -28,7 +28,7 @@ import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorK
 import com.kunzisoft.keepass.database.search.iterator.EntrySearchStringIteratorKDBX
 import java.util.*
 
-class SearchDbHelper(private val isOmitBackup: Boolean) {
+class SearchHelper(private val isOmitBackup: Boolean) {
 
     companion object {
         const val MAX_SEARCH_ENTRY = 6

app/src/main/java/com/kunzisoft/keepass/database/search/iterator/EntrySearchStringIteratorKDB.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.search.iterator
 
-import com.kunzisoft.keepass.database.element.EntryKDB
+import com.kunzisoft.keepass.database.element.entry.EntryKDB
 import com.kunzisoft.keepass.database.search.SearchParameters
 
 import java.util.NoSuchElementException

app/src/main/java/com/kunzisoft/keepass/database/search/iterator/EntrySearchStringIteratorKDBX.kt

@@ -19,7 +19,7 @@
  */
 package com.kunzisoft.keepass.database.search.iterator
 
-import com.kunzisoft.keepass.database.element.EntryKDBX
+import com.kunzisoft.keepass.database.element.entry.EntryKDBX
 import com.kunzisoft.keepass.database.search.SearchParametersKDBX
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import java.util.*

app/src/main/java/com/kunzisoft/keepass/icons/IconDrawableFactory.kt

@@ -33,9 +33,9 @@ import androidx.core.widget.ImageViewCompat
 import android.util.Log
 import android.widget.ImageView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.IconImage
-import com.kunzisoft.keepass.database.element.IconImageCustom
-import com.kunzisoft.keepass.database.element.IconImageStandard
+import com.kunzisoft.keepass.database.element.icon.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImageCustom
+import com.kunzisoft.keepass.database.element.icon.IconImageStandard
 import org.apache.commons.collections.map.AbstractReferenceMap
 import org.apache.commons.collections.map.ReferenceMap
 

app/src/main/java/com/kunzisoft/keepass/notifications/DatabaseTaskNotificationService.kt

@@ -11,6 +11,9 @@ import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
 import com.kunzisoft.keepass.database.action.*
 import com.kunzisoft.keepass.database.action.node.*
 import com.kunzisoft.keepass.database.element.*
+import com.kunzisoft.keepass.database.element.node.Node
+import com.kunzisoft.keepass.database.element.node.NodeId
+import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater

app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt

@@ -15,8 +15,8 @@ import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
 import com.kunzisoft.keepass.activities.lock.lock
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine
 import com.kunzisoft.keepass.database.element.Database
-import com.kunzisoft.keepass.database.element.CompressionAlgorithm
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.notifications.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.settings.preference.*
 import com.kunzisoft.keepass.settings.preferencedialogfragment.*

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseDataCompressionPreferenceDialogFragmentCompat.kt

@@ -24,7 +24,7 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.CompressionAlgorithm
+import com.kunzisoft.keepass.database.element.database.CompressionAlgorithm
 import com.kunzisoft.keepass.settings.preferencedialogfragment.adapter.ListRadioItemAdapter
 
 class DatabaseDataCompressionPreferenceDialogFragmentCompat

app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.kt

@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.EncryptionAlgorithm
+import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm
 import com.kunzisoft.keepass.settings.preferencedialogfragment.adapter.ListRadioItemAdapter
 
 class DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat

app/src/main/java/com/kunzisoft/keepass/view/EntryEditContentsView.kt

@@ -11,7 +11,7 @@ import android.widget.EditText
 import android.widget.ImageView
 import android.widget.LinearLayout
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.database.element.IconImage
+import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.database.element.security.ProtectedString
 import com.kunzisoft.keepass.icons.IconDrawableFactory
 import com.kunzisoft.keepass.icons.assignDatabaseIcon