diff --git a/database/db_adapter.py b/database/db_adapter.py
index cf60431..d490445 100644
--- a/database/db_adapter.py
+++ b/database/db_adapter.py
@@ -8,7 +8,7 @@ import sqlparse
 
 from models.DatabaseConfig import DatabaseConfig
 from models.DatabaseType import  DatabaseType
-from keepass.keepass import KeePass
+from keepass.Keepass import KeePass
 from models.ExportType import ExportType
 from models.Municipality import Municipality
 
diff --git a/keepass/keepass.py b/keepass/Keepass.py
similarity index 85%
rename from keepass/keepass.py
rename to keepass/Keepass.py
index 197d770..768e7f3 100644
--- a/keepass/keepass.py
+++ b/keepass/Keepass.py
@@ -1,25 +1,10 @@
 import getpass
 import logging
-from dataclasses import dataclass
 
 from pykeepass import PyKeePass
 
 from models.KeePassConfig import KeePassConfig
-
-
-@dataclass
-class KeePassEntry:
-    def __init__(self, name: str, password: str):
-        self._name = name
-        self._password = password
-
-    @property
-    def password(self) -> str:
-        return self._password
-
-    @property
-    def name(self) -> str:
-        return self._name
+from models.KeePassEntry import KeePassEntry
 
 
 class KeePass:
diff --git a/main.py b/main.py
index 0bc1e1e..78bea0f 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 from config.Config import Config
 from database.db_adapter import DBAdapter
-from keepass.keepass import KeePass
+from keepass.Keepass import KeePass
 from logger.logger import init_logger
 from models.Municipality import Municipality
 
diff --git a/models/KeePassEntry.py b/models/KeePassEntry.py
new file mode 100644
index 0000000..9ea3623
--- /dev/null
+++ b/models/KeePassEntry.py
@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class KeePassEntry:
+    def __init__(self, name: str, password: str):
+        self._name = name
+        self._password = password
+
+    @property
+    def password(self) -> str:
+        return self._password
+
+    @property
+    def name(self) -> str:
+        return self._name