diff --git a/su4sml/src/codegen/templates/C#.tpl b/su4sml/share/templates/C#.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/C#.tpl
rename to su4sml/share/templates/C#.tpl
diff --git a/su4sml/src/codegen/templates/C#_SM.tpl b/su4sml/share/templates/C#_SM.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/C#_SM.tpl
rename to su4sml/share/templates/C#_SM.tpl
diff --git a/su4sml/src/codegen/templates/C#_SecureUML.tpl b/su4sml/share/templates/C#_SecureUML.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/C#_SecureUML.tpl
rename to su4sml/share/templates/C#_SecureUML.tpl
diff --git a/su4sml/src/codegen/templates/Java_SM.tpl b/su4sml/share/templates/Java_SM.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/Java_SM.tpl
rename to su4sml/share/templates/Java_SM.tpl
diff --git a/su4sml/src/codegen/templates/SMGraph.tpl b/su4sml/share/templates/SMGraph.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/SMGraph.tpl
rename to su4sml/share/templates/SMGraph.tpl
diff --git a/su4sml/src/codegen/templates/base.tpl b/su4sml/share/templates/base.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/base.tpl
rename to su4sml/share/templates/base.tpl
diff --git a/su4sml/src/codegen/templates/java.tpl b/su4sml/share/templates/java.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/java.tpl
rename to su4sml/share/templates/java.tpl
diff --git a/su4sml/src/codegen/templates/java_ocl.tpl b/su4sml/share/templates/java_ocl.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/java_ocl.tpl
rename to su4sml/share/templates/java_ocl.tpl
diff --git a/su4sml/src/codegen/templates/junit.tpl b/su4sml/share/templates/junit.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/junit.tpl
rename to su4sml/share/templates/junit.tpl
diff --git a/su4sml/src/codegen/templates/maven_pom.tpl b/su4sml/share/templates/maven_pom.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/maven_pom.tpl
rename to su4sml/share/templates/maven_pom.tpl
diff --git a/su4sml/src/codegen/templates/securemova.tpl b/su4sml/share/templates/securemova.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/securemova.tpl
rename to su4sml/share/templates/securemova.tpl
diff --git a/su4sml/src/codegen/templates/tpl.el b/su4sml/share/templates/tpl.el
similarity index 100%
rename from su4sml/src/codegen/templates/tpl.el
rename to su4sml/share/templates/tpl.el
diff --git a/su4sml/src/codegen/templates/use.tpl b/su4sml/share/templates/use.tpl
similarity index 100%
rename from su4sml/src/codegen/templates/use.tpl
rename to su4sml/share/templates/use.tpl
diff --git a/su4sml/src/codegen/tpl_parser.sml b/su4sml/src/codegen/tpl_parser.sml
index d0bc6e7..f5b5633 100644
--- a/su4sml/src/codegen/tpl_parser.sml
+++ b/su4sml/src/codegen/tpl_parser.sml
@@ -203,16 +203,13 @@ fun buildTree (SOME line) =
   | buildTree NONE  = []
     
 
-
-fun codegen_home _ = getOpt (OS.Process.getEnv "CODEGEN_HOME", Config.su4sml_home()^"/codegen")
-                     
 (** calls the external cpp ( C PreProcessor).
  * writes merged template to a file with extension .tmp instead of .tpl
  * and returns this file 
  *)
 fun call_cpp file = 
     let val targetFile = OS.FileSys.tmpName () 
-        val _ = OS.Process.system ("cpp -P -C "^codegen_home()^"/"^file^" "^targetFile)
+        val _ = OS.Process.system ("cpp -P -C "^(Config.su4sml_share())^"/"^file^" "^targetFile)
     in
         targetFile
     end