diff --git a/pom.xml b/pom.xml
index 1f19d25b1442546f0bc8fc1d7647526f5c62a09a..0b8f77f0845f5cceef91ecdbfbfe3d3d33b9748c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
             <configuration>
               <archive>
                 <manifest>
-                  <mainClass>de.monticore.lang.monticar.cnnarch.generator.CNNArch2Caffe2Cli</mainClass>
+                  <mainClass>de.monticore.lang.monticar.cnnarch.caffe2generator.CNNArch2Caffe2Cli</mainClass>
                 </manifest>
               </archive>
               <descriptorRefs>
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/ArchitectureElementData.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/ArchitectureElementData.java
similarity index 99%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/ArchitectureElementData.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/ArchitectureElementData.java
index 7f2d226438d3436d1ce7aa940617d5792a97883a..938f608e369a31a34bf3a169f13d79697e605fcb 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/ArchitectureElementData.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/ArchitectureElementData.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.ArchTypeSymbol;
 import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureElementSymbol;
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2Caffe2.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2.java
similarity index 99%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2Caffe2.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2.java
index 3da82874bb90295039082dafbe9a2bfad45cb8c8..d91c2b2916d20f28727c02362a756f890561a2d6 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2Caffe2.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.io.paths.ModelPath;
 import de.monticore.lang.monticar.cnnarch.CNNArchGenerator;
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2Caffe2Cli.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2Cli.java
similarity index 98%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2Caffe2Cli.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2Cli.java
index 764d73e8386722273280e3242d7e72369bf45da3..69c296428ef71bd7643c6d377e87a5330f8b5629 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2Caffe2Cli.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArch2Caffe2Cli.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import org.apache.commons.cli.*;
 
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchTemplateController.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArchTemplateController.java
similarity index 99%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchTemplateController.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArchTemplateController.java
index 59ecb4b7623b496603c2b54fb84f7649316e4a8a..0ea41ea21587bc908026353f34386e92dfe5552a 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchTemplateController.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/CNNArchTemplateController.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.*;
 import de.monticore.lang.monticar.cnnarch.predefined.Sigmoid;
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/ConfigurationData.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/ConfigurationData.java
similarity index 97%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/ConfigurationData.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/ConfigurationData.java
index 6dbf2bf65aff0446f383ca31904f62b22fdec1d3..ad337467b4c1e44fdb6e96893fcaafc21ebfdd00 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/ConfigurationData.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/ConfigurationData.java
@@ -1,4 +1,4 @@
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.lang.monticar.cnntrain._symboltable.*;
 
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/LayerNameCreator.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/LayerNameCreator.java
similarity index 99%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/LayerNameCreator.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/LayerNameCreator.java
index afc1886802af4fa3b0a06d1e413befccbc69b796..b264a45ae34365b4ffbd74279a026bd6b8d136d6 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/LayerNameCreator.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/LayerNameCreator.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.lang.monticar.cnnarch._symboltable.*;
 import de.monticore.lang.monticar.cnnarch.predefined.Convolution;
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/Target.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/Target.java
similarity index 95%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/Target.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/Target.java
index fe224330e13cc113c2b8539ccd8d7b98bd3d6fce..6fa402f0983661c941f258493d8691899f33d97d 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/Target.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/Target.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 //can be removed
 public enum Target {
diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/TemplateConfiguration.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java
similarity index 97%
rename from src/main/java/de/monticore/lang/monticar/cnnarch/generator/TemplateConfiguration.java
rename to src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java
index d797d4bc0b9987860e4d265862f2fa28fcf10612..dd8c948e246604d7c98f64146c5cc40cd86e31c3 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/generator/TemplateConfiguration.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch.generator;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.se_rwth.commons.logging.Log;
 import freemarker.template.Configuration;
diff --git a/src/test/java/de/monticore/lang/monticar/cnnarch/AbstractSymtabTest.java b/src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/AbstractSymtabTest.java
similarity index 98%
rename from src/test/java/de/monticore/lang/monticar/cnnarch/AbstractSymtabTest.java
rename to src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/AbstractSymtabTest.java
index bab36231a4fef2aa9cdd536c06e469e820b8c030..a0c78873757fb4d71ca1d71e538eec56fa20405f 100644
--- a/src/test/java/de/monticore/lang/monticar/cnnarch/AbstractSymtabTest.java
+++ b/src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/AbstractSymtabTest.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.ModelingLanguageFamily;
 import de.monticore.io.paths.ModelPath;
diff --git a/src/test/java/de/monticore/lang/monticar/cnnarch/GenerationTest.java b/src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/GenerationTest.java
similarity index 97%
rename from src/test/java/de/monticore/lang/monticar/cnnarch/GenerationTest.java
rename to src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/GenerationTest.java
index 6100e9dedbd07e352aeb0c7d655415665d73d9c0..2b84f722df1bc36baf170ebe8209c9bcc860b558 100644
--- a/src/test/java/de/monticore/lang/monticar/cnnarch/GenerationTest.java
+++ b/src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/GenerationTest.java
@@ -18,11 +18,9 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.io.paths.ModelPath;
-import de.monticore.lang.monticar.cnnarch.generator.CNNArch2Caffe2;
-import de.monticore.lang.monticar.cnnarch.generator.CNNArch2Caffe2Cli;
 import de.monticore.lang.monticar.cnntrain._cocos.CNNTrainCocos;
 import de.monticore.lang.monticar.cnntrain._symboltable.CNNTrainCompilationUnitSymbol;
 import de.monticore.lang.monticar.cnntrain._symboltable.CNNTrainLanguage;
diff --git a/src/test/java/de/monticore/lang/monticar/cnnarch/SymtabTest.java b/src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/SymtabTest.java
similarity index 98%
rename from src/test/java/de/monticore/lang/monticar/cnnarch/SymtabTest.java
rename to src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/SymtabTest.java
index d30f3767b4a28ba152eebb343ad6682c92ef0722..7c3ccbcc5ca04f1d6be117a48dde27dd8665a8b1 100644
--- a/src/test/java/de/monticore/lang/monticar/cnnarch/SymtabTest.java
+++ b/src/test/java/de/monticore/lang/monticar/cnnarch/caffe2generator/SymtabTest.java
@@ -18,7 +18,7 @@
  *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
  * *******************************************************************************
  */
-package de.monticore.lang.monticar.cnnarch;
+package de.monticore.lang.monticar.cnnarch.caffe2generator;
 
 import de.monticore.lang.monticar.cnnarch._parser.CNNArchParser;
 import de.monticore.lang.monticar.cnnarch._symboltable.CNNArchCompilationUnitSymbol;