diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenConfigFileParser.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenConfigFileParser.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenConfigFileParser.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenConfigFileParser.java
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutionRequestFactory.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutionRequestFactory.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutionRequestFactory.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutionRequestFactory.java
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutionResultException.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutionResultException.java
similarity index 95%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutionResultException.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutionResultException.java
index 111287199..e5fc907e8 100644
--- a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutionResultException.java
+++ b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutionResultException.java
@@ -26,7 +26,7 @@
  *
  * @author Fabian Krüger
  */
-public class MavenExecutionResultException extends RuntimeException {
+ class MavenExecutionResultException extends RuntimeException {
 
     @Getter
     private final List<Throwable> exceptions;
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutor.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutor.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenExecutor.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenExecutor.java
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenModelReader.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenModelReader.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenModelReader.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenModelReader.java
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenMojoProjectParserFactory.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserFactory.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenMojoProjectParserFactory.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserFactory.java
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenMojoProjectParserPrivateMethods.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserPrivateMethods.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenMojoProjectParserPrivateMethods.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserPrivateMethods.java
diff --git a/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenPlexusContainer.java b/sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenPlexusContainer.java
similarity index 100%
rename from sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenPlexusContainer.java
rename to sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/maven/MavenPlexusContainer.java