diff --git a/src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java b/src/main/java/de/marhali/easyi18n/io/folder/FolderStrategyType.java
similarity index 81%
rename from src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java
rename to src/main/java/de/marhali/easyi18n/io/folder/FolderStrategyType.java
index 212538b..047a563 100644
--- a/src/main/java/de/marhali/easyi18n/model/FolderStrategyType.java
+++ b/src/main/java/de/marhali/easyi18n/io/folder/FolderStrategyType.java
@@ -1,9 +1,4 @@
-package de.marhali.easyi18n.model;
-
-import de.marhali.easyi18n.io.folder.FolderStrategy;
-import de.marhali.easyi18n.io.folder.ModularLocaleFolderStrategy;
-import de.marhali.easyi18n.io.folder.ModularNamespaceFolderStrategy;
-import de.marhali.easyi18n.io.folder.SingleFolderStrategy;
+package de.marhali.easyi18n.io.folder;
 
 /**
  * Represents all supported folder strategies.
diff --git a/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java b/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java
index 07bc38c..b94c0b3 100644
--- a/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java
+++ b/src/main/java/de/marhali/easyi18n/io/parser/ParserStrategy.java
@@ -2,6 +2,7 @@ package de.marhali.easyi18n.io.parser;
 
 import de.marhali.easyi18n.model.*;
 
+import de.marhali.easyi18n.model.KeyPath;
 import de.marhali.easyi18n.settings.ProjectSettings;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,7 +47,7 @@ public abstract class ParserStrategy {
 
         if(file.getNamespace() != null) {
             String moduleName = file.getNamespace();
-            TranslationNode moduleNode = data.getNode(KeyPath.of(moduleName));
+            TranslationNode moduleNode = data.getNode(new KeyPath(moduleName));
 
             if(moduleNode == null) {
                 moduleNode = new TranslationNode(this.settings.isSorting());
@@ -69,7 +70,7 @@ public abstract class ParserStrategy {
         TranslationNode targetNode = data.getRootNode();
 
         if(file.getNamespace() != null) {
-            targetNode = data.getNode(KeyPath.of(file.getNamespace()));
+            targetNode = data.getNode(new KeyPath(file.getNamespace()));
         }
 
         return Objects.requireNonNull(targetNode);
diff --git a/src/main/java/de/marhali/easyi18n/settings/ProjectSettings.java b/src/main/java/de/marhali/easyi18n/settings/ProjectSettings.java
index 1f17de5..5b73e9d 100644
--- a/src/main/java/de/marhali/easyi18n/settings/ProjectSettings.java
+++ b/src/main/java/de/marhali/easyi18n/settings/ProjectSettings.java
@@ -1,7 +1,7 @@
 package de.marhali.easyi18n.settings;
 
 import de.marhali.easyi18n.io.parser.ParserStrategyType;
-import de.marhali.easyi18n.model.FolderStrategyType;
+import de.marhali.easyi18n.io.folder.FolderStrategyType;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsComponentState.java b/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsComponentState.java
index 3091472..f3dd07e 100644
--- a/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsComponentState.java
+++ b/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsComponentState.java
@@ -4,7 +4,7 @@ import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 
 import de.marhali.easyi18n.io.parser.ParserStrategyType;
-import de.marhali.easyi18n.model.FolderStrategyType;
+import de.marhali.easyi18n.io.folder.FolderStrategyType;
 import de.marhali.easyi18n.settings.presets.Preset;
 
 import javax.swing.*;
diff --git a/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsState.java b/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsState.java
index 3ec02df..d4a077d 100644
--- a/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsState.java
+++ b/src/main/java/de/marhali/easyi18n/settings/ProjectSettingsState.java
@@ -1,7 +1,7 @@
 package de.marhali.easyi18n.settings;
 
 import de.marhali.easyi18n.io.parser.ParserStrategyType;
-import de.marhali.easyi18n.model.FolderStrategyType;
+import de.marhali.easyi18n.io.folder.FolderStrategyType;
 import de.marhali.easyi18n.settings.presets.DefaultPreset;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/de/marhali/easyi18n/settings/presets/DefaultPreset.java b/src/main/java/de/marhali/easyi18n/settings/presets/DefaultPreset.java
index fb515fe..124f1d9 100644
--- a/src/main/java/de/marhali/easyi18n/settings/presets/DefaultPreset.java
+++ b/src/main/java/de/marhali/easyi18n/settings/presets/DefaultPreset.java
@@ -1,7 +1,7 @@
 package de.marhali.easyi18n.settings.presets;
 
 import de.marhali.easyi18n.io.parser.ParserStrategyType;
-import de.marhali.easyi18n.model.FolderStrategyType;
+import de.marhali.easyi18n.io.folder.FolderStrategyType;
 import de.marhali.easyi18n.settings.ProjectSettings;
 
 import org.jetbrains.annotations.NotNull;