diff --git a/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java
index dd8c948e246604d7c98f64146c5cc40cd86e31c3..10295f303640064dc8364e94db131f6319f4ec83 100644
--- a/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java
+++ b/src/main/java/de/monticore/lang/monticar/cnnarch/caffe2generator/TemplateConfiguration.java
@@ -38,7 +38,7 @@ public class TemplateConfiguration {
 
     private TemplateConfiguration() {
         configuration = new Configuration(Configuration.VERSION_2_3_23);
-        configuration.setClassForTemplateLoading(TemplateConfiguration.class, "/templates/");
+        configuration.setClassForTemplateLoading(TemplateConfiguration.class, "/templates/caffe2/");
         configuration.setDefaultEncoding("UTF-8");
         configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
     }
diff --git a/src/main/resources/templates/CNNBufferFile.ftl b/src/main/resources/templates/caffe2/CNNBufferFile.ftl
similarity index 100%
rename from src/main/resources/templates/CNNBufferFile.ftl
rename to src/main/resources/templates/caffe2/CNNBufferFile.ftl
diff --git a/src/main/resources/templates/CNNCreator.ftl b/src/main/resources/templates/caffe2/CNNCreator.ftl
similarity index 99%
rename from src/main/resources/templates/CNNCreator.ftl
rename to src/main/resources/templates/caffe2/CNNCreator.ftl
index 0906e9a5b305354ee72ced7e702f3361f70a4c32..fd15b6bb39924f5328b3dd82df60e82ae2a926a4 100644
--- a/src/main/resources/templates/CNNCreator.ftl
+++ b/src/main/resources/templates/caffe2/CNNCreator.ftl
@@ -1,4 +1,5 @@
 <#-- CAFFE2 -->
+//CAFFE2
 
 import mxnet as mx
 import logging
diff --git a/src/main/resources/templates/CNNPredictor.ftl b/src/main/resources/templates/caffe2/CNNPredictor.ftl
similarity index 99%
rename from src/main/resources/templates/CNNPredictor.ftl
rename to src/main/resources/templates/caffe2/CNNPredictor.ftl
index da440d05a3d29bb9917b5ad53946c3f526635ad5..b09397fde0a9b96931a6aed2b194ffccd588e277 100644
--- a/src/main/resources/templates/CNNPredictor.ftl
+++ b/src/main/resources/templates/caffe2/CNNPredictor.ftl
@@ -1,4 +1,5 @@
 <#-- CAFFE2 -->
+//CAFFE2
 
 #ifndef ${tc.fileNameWithoutEnding?upper_case}
 #define ${tc.fileNameWithoutEnding?upper_case}
diff --git a/src/main/resources/templates/CNNTrainer.ftl b/src/main/resources/templates/caffe2/CNNTrainer.ftl
similarity index 100%
rename from src/main/resources/templates/CNNTrainer.ftl
rename to src/main/resources/templates/caffe2/CNNTrainer.ftl
diff --git a/src/main/resources/templates/elements/Add.ftl b/src/main/resources/templates/caffe2/elements/Add.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Add.ftl
rename to src/main/resources/templates/caffe2/elements/Add.ftl
diff --git a/src/main/resources/templates/elements/BatchNorm.ftl b/src/main/resources/templates/caffe2/elements/BatchNorm.ftl
similarity index 100%
rename from src/main/resources/templates/elements/BatchNorm.ftl
rename to src/main/resources/templates/caffe2/elements/BatchNorm.ftl
diff --git a/src/main/resources/templates/elements/Concatenate.ftl b/src/main/resources/templates/caffe2/elements/Concatenate.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Concatenate.ftl
rename to src/main/resources/templates/caffe2/elements/Concatenate.ftl
diff --git a/src/main/resources/templates/elements/Convolution.ftl b/src/main/resources/templates/caffe2/elements/Convolution.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Convolution.ftl
rename to src/main/resources/templates/caffe2/elements/Convolution.ftl
diff --git a/src/main/resources/templates/elements/Dropout.ftl b/src/main/resources/templates/caffe2/elements/Dropout.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Dropout.ftl
rename to src/main/resources/templates/caffe2/elements/Dropout.ftl
diff --git a/src/main/resources/templates/elements/Flatten.ftl b/src/main/resources/templates/caffe2/elements/Flatten.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Flatten.ftl
rename to src/main/resources/templates/caffe2/elements/Flatten.ftl
diff --git a/src/main/resources/templates/elements/FullyConnected.ftl b/src/main/resources/templates/caffe2/elements/FullyConnected.ftl
similarity index 100%
rename from src/main/resources/templates/elements/FullyConnected.ftl
rename to src/main/resources/templates/caffe2/elements/FullyConnected.ftl
diff --git a/src/main/resources/templates/elements/Get.ftl b/src/main/resources/templates/caffe2/elements/Get.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Get.ftl
rename to src/main/resources/templates/caffe2/elements/Get.ftl
diff --git a/src/main/resources/templates/elements/GlobalPooling.ftl b/src/main/resources/templates/caffe2/elements/GlobalPooling.ftl
similarity index 100%
rename from src/main/resources/templates/elements/GlobalPooling.ftl
rename to src/main/resources/templates/caffe2/elements/GlobalPooling.ftl
diff --git a/src/main/resources/templates/elements/Input.ftl b/src/main/resources/templates/caffe2/elements/Input.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Input.ftl
rename to src/main/resources/templates/caffe2/elements/Input.ftl
diff --git a/src/main/resources/templates/elements/Lrn.ftl b/src/main/resources/templates/caffe2/elements/Lrn.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Lrn.ftl
rename to src/main/resources/templates/caffe2/elements/Lrn.ftl
diff --git a/src/main/resources/templates/elements/Output.ftl b/src/main/resources/templates/caffe2/elements/Output.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Output.ftl
rename to src/main/resources/templates/caffe2/elements/Output.ftl
diff --git a/src/main/resources/templates/elements/OutputShape.ftl b/src/main/resources/templates/caffe2/elements/OutputShape.ftl
similarity index 100%
rename from src/main/resources/templates/elements/OutputShape.ftl
rename to src/main/resources/templates/caffe2/elements/OutputShape.ftl
diff --git a/src/main/resources/templates/elements/Pooling.ftl b/src/main/resources/templates/caffe2/elements/Pooling.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Pooling.ftl
rename to src/main/resources/templates/caffe2/elements/Pooling.ftl
diff --git a/src/main/resources/templates/elements/Relu.ftl b/src/main/resources/templates/caffe2/elements/Relu.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Relu.ftl
rename to src/main/resources/templates/caffe2/elements/Relu.ftl
diff --git a/src/main/resources/templates/elements/Sigmoid.ftl b/src/main/resources/templates/caffe2/elements/Sigmoid.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Sigmoid.ftl
rename to src/main/resources/templates/caffe2/elements/Sigmoid.ftl
diff --git a/src/main/resources/templates/elements/Softmax.ftl b/src/main/resources/templates/caffe2/elements/Softmax.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Softmax.ftl
rename to src/main/resources/templates/caffe2/elements/Softmax.ftl
diff --git a/src/main/resources/templates/elements/Split.ftl b/src/main/resources/templates/caffe2/elements/Split.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Split.ftl
rename to src/main/resources/templates/caffe2/elements/Split.ftl
diff --git a/src/main/resources/templates/elements/Tanh.ftl b/src/main/resources/templates/caffe2/elements/Tanh.ftl
similarity index 100%
rename from src/main/resources/templates/elements/Tanh.ftl
rename to src/main/resources/templates/caffe2/elements/Tanh.ftl
diff --git a/src/main/resources/templates/execute.ftl b/src/main/resources/templates/caffe2/execute.ftl
similarity index 100%
rename from src/main/resources/templates/execute.ftl
rename to src/main/resources/templates/caffe2/execute.ftl