diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java
index 682376c..ff59f35 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java
@@ -60,9 +60,7 @@ public class MongoDBHandler {
 
 
     public MongoDBHandler() {
-        // Load the MongoDB configuration from the properties file
-        String propertiesFilePath = "config/database.properties";
-        // Set loglevel for slf4j to avoid spam
+        // Set loglevel for slf4j to avoid spam // TODO: Fix this (optional)
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "error");
         Properties mongoProperties = PropertiesUtils.readPropertiesFromResource(propertiesFileName);
         // Zugangsdaten
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/JavalinConfig.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/JavalinConfig.java
index d5bb970..8136ed6 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/JavalinConfig.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/JavalinConfig.java
@@ -13,7 +13,7 @@ import java.util.Properties;
  */
 public class JavalinConfig extends Properties {
 
-    private static final String propertiesFileName = "javalin.properties";
+    private static final String propertiesFileName = "config/javalin.properties";
 
     /**
      * Default Constructor
diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java
index 30dd722..36eed86 100644
--- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java
+++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/util/PPRUtils.java
@@ -51,7 +51,7 @@ public abstract class PPRUtils {
      * @param mongoFactory Factory für die MongoDB-Objekte
      */
     public static void parlamentExplorerInit(FileObjectFactory xmlFactory, MongoObjectFactory mongoFactory) {
-        Properties xmlProperties = PropertiesUtils.readPropertiesFromResource("xml.properties");
+        Properties xmlProperties = PropertiesUtils.readPropertiesFromResource("config/xml.properties");
 
         // MdB lesen: MDBs werden nur dann gelesen und persistiert, wenn die Collection noch leer ist
         String mdbUrl = xmlProperties.getProperty("mdb_url");
diff --git a/src/main/resources/javalin.properties b/src/main/resources/config/javalin.properties
similarity index 100%
rename from src/main/resources/javalin.properties
rename to src/main/resources/config/javalin.properties
diff --git a/src/main/resources/xml.properties b/src/main/resources/config/xml.properties
similarity index 100%
rename from src/main/resources/xml.properties
rename to src/main/resources/config/xml.properties