diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92db103c64b59196f4debe5f127013a1c4f9c09f..745133cfc2a9b569da0a8dabee82a8a810c1f193 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,10 @@
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 image: maven:3-jdk-8
 
diff --git a/.travis.yml b/.travis.yml
index cca69f5b8bafe3a2eb71d22b1e8327a7d17fbd2d..f8eceb5678d9cb97daed4863a5a7d12f7bdc60be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-# (c) https://github.com/MontiCore/monticore  
 script:
 - git checkout ${TRAVIS_BRANCH}
 - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report --settings "settings.xml"
diff --git a/README.md b/README.md
index 96eabdd76e8c2589e32d9b81b973bc063dbf6f80..ef5b653f39cfe3cc46be10ffa002d53abe61f40c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<!-- (c) https://github.com/MontiCore/monticore -->
 # Server
 ![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/build.svg)
 ![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/coverage.svg)
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 8bde8f7197aa176a3a2e8cdb670d353fd9ac2254..b83cfa1818870422d378d269614f04d72df0923a 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) https://github.com/MontiCore/monticore -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>montisim</artifactId>
diff --git a/docker/World.zone.xml b/docker/World.zone.xml
index aab7cf31ff707ba6e17bc26bf05440c03f79330d..13979681d4cdf7fab2f0c23832b7e41109681a19 100644
--- a/docker/World.zone.xml
+++ b/docker/World.zone.xml
@@ -1,4 +1,11 @@
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <zone>
   <name>World</name>
   <isCustomLogin>false</isCustomLogin>
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7d7c7d6ece51d221e565e581da465152a20ea583..173971e1dcbbe775cb411f78b99bef2de67b11df 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,10 @@
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 version: "3"
 
 services:
diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
index 796affcd3c009b31d183bdbc5066fe5221df5d43..71a7f63374ec3ab21927dda72f1825251a714040 100644
--- a/docker/postgres/Dockerfile
+++ b/docker/postgres/Dockerfile
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 FROM postgres:latest
 
 COPY ./db-create-script.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/docker/postgres/db-create-script.sql b/docker/postgres/db-create-script.sql
index 04240cfbc2f976b9f7efdafc051b8f5d1327d741..b109eafa749066b7b0b16a926e4dd77339c198b5 100644
--- a/docker/postgres/db-create-script.sql
+++ b/docker/postgres/db-create-script.sql
@@ -1,3 +1,10 @@
+--
+-- (c) https://github.com/MontiCore/monticore
+--
+-- The license generally applicable for this project
+-- can be found under https://github.com/MontiCore/monticore.
+--
+
 --
 -- PostgreSQL database dump
 --
diff --git a/docs/DBscripts/sqlite-create-script.bat b/docs/DBscripts/sqlite-create-script.bat
index 24ec265ad7419feb93e9e21df49f05d67f4c2ccd..3118c8704955ed637825f1d53657d731df2b5390 100644
--- a/docs/DBscripts/sqlite-create-script.bat
+++ b/docs/DBscripts/sqlite-create-script.bat
@@ -1,2 +1,8 @@
-@rem (c) https://github.com/MontiCore/monticore  
+@REM
+@REM (c) https://github.com/MontiCore/monticore
+@REM
+@REM The license generally applicable for this project
+@REM can be found under https://github.com/MontiCore/monticore.
+@REM
+
 sqlite3 world.db ".read sqlite-world.sql"
diff --git a/docs/DBscripts/sqlite-create-script.sh b/docs/DBscripts/sqlite-create-script.sh
index 62b529b2b7be7aeb4fb3cadc629e1e0848f995ae..51501a58bce07f7e7d081df37bf10ff26b19a128 100644
--- a/docs/DBscripts/sqlite-create-script.sh
+++ b/docs/DBscripts/sqlite-create-script.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 sqlite3 world_linux.db ".read sqlite-world.sql"
diff --git a/docs/DBscripts/sqlite-world.sql b/docs/DBscripts/sqlite-world.sql
index e0708052a588fd9f959d0cd6f0d0c05a2372605a..e710eee9f176146bad438c3dcaf50c7d537e5d21 100644
--- a/docs/DBscripts/sqlite-world.sql
+++ b/docs/DBscripts/sqlite-world.sql
@@ -1,3 +1,10 @@
+--
+-- (c) https://github.com/MontiCore/monticore
+--
+-- The license generally applicable for this project
+-- can be found under https://github.com/MontiCore/monticore.
+--
+
 CREATE TABLE area (
     id integer NOT NULL PRIMARY KEY AUTOINCREMENT,
     minx double precision NOT NULL,
diff --git a/docs/DBscripts/sqlite_world.sql b/docs/DBscripts/sqlite_world.sql
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6a3e66062a4b2c37f4603f6aecaeac64d9da2deb 100644
--- a/docs/DBscripts/sqlite_world.sql
+++ b/docs/DBscripts/sqlite_world.sql
@@ -0,0 +1,7 @@
+--
+-- (c) https://github.com/MontiCore/monticore
+--
+-- The license generally applicable for this project
+-- can be found under https://github.com/MontiCore/monticore.
+--
+
diff --git a/docs/DBscripts/world.db b/docs/DBscripts/world.db
new file mode 100644
index 0000000000000000000000000000000000000000..b9a66284f5dea0a7208a410bf0ce55c6abe5b895
Binary files /dev/null and b/docs/DBscripts/world.db differ
diff --git a/docs/scripts/deploy.bat b/docs/scripts/deploy.bat
index 75163c4b65d8efa59b74c6b8d048d00f7762a403..f7526fe2af8bb335c3a62adfe94b2108b4798b38 100644
--- a/docs/scripts/deploy.bat
+++ b/docs/scripts/deploy.bat
@@ -1,4 +1,10 @@
-@rem (c) https://github.com/MontiCore/monticore  
+@REM
+@REM (c) https://github.com/MontiCore/monticore
+@REM
+@REM The license generally applicable for this project
+@REM can be found under https://github.com/MontiCore/monticore.
+@REM
+
 REM Batch script
 
 SET CONFIG_DIR=main\resources
diff --git a/docs/scripts/deploy.sh b/docs/scripts/deploy.sh
index 0e29e622cb439d0a5339a1712e95b085bbe2caed..4a22f07f40193269f2cb545785320e3050349d88 100644
--- a/docs/scripts/deploy.sh
+++ b/docs/scripts/deploy.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 CONFIG_DIR="main/resources"
 CONFIG_FILE="config.properties"
diff --git a/docs/scripts/recompile_fmu.sh b/docs/scripts/recompile_fmu.sh
index cf249664a42ba5f38ec9545003db74501b7636c3..aadd04288a4599845bdd9655a2d690874ad63aea 100644
--- a/docs/scripts/recompile_fmu.sh
+++ b/docs/scripts/recompile_fmu.sh
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 # This script re-compile all *.fmu files in the current directory using
 # current available c++ compiler. This makes the fmu files compatible with
diff --git a/libs/fmu_for_linux/BrakeSystem.fmu b/libs/fmu_for_linux/BrakeSystem.fmu
deleted file mode 100644
index 9711c5fb8a473edf659627ac6ea58e73394d5000..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/BrakeSystem.fmu and /dev/null differ
diff --git a/libs/fmu_for_linux/Chassis.fmu b/libs/fmu_for_linux/Chassis.fmu
deleted file mode 100644
index f3e010563c24c184c90e4a87d25f672c86fea9c6..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/Chassis.fmu and /dev/null differ
diff --git a/libs/fmu_for_linux/Driveline.fmu b/libs/fmu_for_linux/Driveline.fmu
deleted file mode 100644
index 53bc4fc36b50806467a9f1abae4e3309c6aea4b2..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/Driveline.fmu and /dev/null differ
diff --git a/libs/fmu_for_linux/InputFilter.fmu b/libs/fmu_for_linux/InputFilter.fmu
deleted file mode 100644
index e053f0311483eaf006dcde7fec39e20dc6abaaa5..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/InputFilter.fmu and /dev/null differ
diff --git a/libs/fmu_for_linux/Steering.fmu b/libs/fmu_for_linux/Steering.fmu
deleted file mode 100644
index dbf26037e5f75ef2d4f6165c006ea0aa28f1f769..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/Steering.fmu and /dev/null differ
diff --git a/libs/fmu_for_linux/Suspension.fmu b/libs/fmu_for_linux/Suspension.fmu
deleted file mode 100644
index 09f5ba11e3862ab217e96c03a28eafe3d13483e9..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/Suspension.fmu and /dev/null differ
diff --git a/libs/fmu_for_linux/Tires.fmu b/libs/fmu_for_linux/Tires.fmu
deleted file mode 100644
index b87526d45e3d0f49f1fae9a07c837803ce31beaa..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_linux/Tires.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/BrakeSystem.fmu b/libs/fmu_for_mac/BrakeSystem.fmu
deleted file mode 100644
index 30d5a878ad152d3ae0de05fbf9731dcdf6c6f14a..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/BrakeSystem.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/Chassis.fmu b/libs/fmu_for_mac/Chassis.fmu
deleted file mode 100644
index fdbbd60a7ce297f31ef83ce254f126286f692006..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/Chassis.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/Driveline.fmu b/libs/fmu_for_mac/Driveline.fmu
deleted file mode 100644
index 15977d07492482679ff0e8d4188737bfe1aec291..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/Driveline.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/InputFilter.fmu b/libs/fmu_for_mac/InputFilter.fmu
deleted file mode 100644
index 514d6dcdb405bb4976517eab7242c0eae7a460ec..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/InputFilter.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/Steering.fmu b/libs/fmu_for_mac/Steering.fmu
deleted file mode 100644
index fa9986fef31dc583cb67308ab95b51df5ed730c6..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/Steering.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/Suspension.fmu b/libs/fmu_for_mac/Suspension.fmu
deleted file mode 100644
index a7b84aa74685a85fe5aa7040c89e0afb462228ce..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/Suspension.fmu and /dev/null differ
diff --git a/libs/fmu_for_mac/Tires.fmu b/libs/fmu_for_mac/Tires.fmu
deleted file mode 100644
index 0cbf760718636066b38239361cfcd74d7f6096c6..0000000000000000000000000000000000000000
Binary files a/libs/fmu_for_mac/Tires.fmu and /dev/null differ
diff --git a/main/resources/aachen.sim b/main/resources/aachen.sim
index 0e68119d1ff185a74f1bcd1df2335f044e1001b2..b4b9c497b3adcb7373bc82ecc2653210b8d61a39 100644
--- a/main/resources/aachen.sim
+++ b/main/resources/aachen.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 4h;
     
diff --git a/main/resources/aachen2.sim b/main/resources/aachen2.sim
index c26ce5a5f6261d7be210bea6cf42e7c0497a4b4c..9be1222c66ecf1b60d0bfc7883764b27c1743b67 100644
--- a/main/resources/aachen2.sim
+++ b/main/resources/aachen2.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 4h;
 
diff --git a/main/resources/config.properties b/main/resources/config.properties
index b8fd7ebd9f4955ef757b695d58d9d7dd9be7e26a..b0e3b3d4eaf3ca6be21e25aac0972662db089d53 100644
--- a/main/resources/config.properties
+++ b/main/resources/config.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 map=/extensions/AllInOne/aachen.osm
 mapName=Aachen2
 flat_map=true
diff --git a/pom.xml b/pom.xml
index 68628c0a3278933f629d5c548e14a4c466c87d06..b3a6fdbf93b7e6b00993b73796d56102caaecf4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>server</artifactId>
     <groupId>montisim</groupId>
-    <version>2.0.0</version>
-    <packaging>pom</packaging>
+    <version>2.0.1</version>
+    <packaging>jar</packaging>
 
     <!--<modules>-->
     <!--<module>rpc</module>-->
@@ -15,15 +22,17 @@
 
 
     <properties>
-        <montisim.commons.version>1.0.9</montisim.commons.version>
+        <montisim.commons.version>1.0.10</montisim.commons.version>
         <montisim.simulation.version>2.0.2</montisim.simulation.version>
-        <montisim.controller.version>1.0.3</montisim.controller.version>
+        <montisim.controller.version>1.0.4</montisim.controller.version>
+        <montisim.rmimodelserver.version>1.1.4</montisim.rmimodelserver.version>
+        <montisim.simlang.version>1.0.1</montisim.simlang.version>
 
         <smartfox.version>2.13</smartfox.version>
 
         <!-- .. Plugins ....................................................... -->
         <assembly.plugin>2.5.4</assembly.plugin>
-        <compiler.plugin>3.3</compiler.plugin>
+        <!-- <compiler.plugin>3.3</compiler.plugin> -->
         <source.plugin>2.4</source.plugin>
         <shade.plugin>2.4.3</shade.plugin>
         <jacoco.plugin>0.8.1</jacoco.plugin>
@@ -160,7 +169,7 @@
         <dependency>
             <groupId>montisim</groupId>
             <artifactId>rmi-model-server</artifactId>
-            <version>1.1.3</version>
+            <version>${montisim.rmimodelserver.version}</version>
         </dependency>
         <!-- Autopilot -->
         <dependency>
@@ -172,7 +181,7 @@
         <dependency>
             <groupId>de.monticore.lang.montisim</groupId>
             <artifactId>SimLang</artifactId>
-            <version>1.0.1</version>
+            <version>${montisim.simlang.version}</version>
         </dependency>
         <dependency>
             <groupId>de.monticore.lang.montisim</groupId>
@@ -218,8 +227,8 @@
             </activation>
             <properties>
                 <script.extension>.bat</script.extension>
-                <sfs.directory>C:\SmartFoxServer_2X\SFS2X</sfs.directory>
-                <sfs.extensions>${sfs.directory}\extensions\AllInOne</sfs.extensions>
+                <sfs.directory>${project.basedir}/../../SFS2X</sfs.directory>
+                <sfs.extensions>${sfs.directory}/extensions/AllInOne</sfs.extensions>
             </properties>
         </profile>
         <profile>
@@ -248,7 +257,7 @@
             <!-- Other Configuration -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.plugin}</version>
+                <version>3.8.0</version>
                 <configuration>
                     <useIncrementalCompilation>true</useIncrementalCompilation>
                     <source>${java.version}</source>
@@ -299,7 +308,7 @@
 
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>package rwth.server.extensions.ZoneExt</mainClass>
+                                    <mainClass>rwth.server.extensions.ZoneExt</mainClass>
                                 </transformer>
                             </transformers>
                             <outputFile>${sfs.extensions}/${project.name}.jar</outputFile>
@@ -330,35 +339,32 @@
                     </execution>
                 </executions>
             </plugin>
+            
+            
             <!-- to add copyright information automatically-->
-            <!--
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>${project.baseUri}/src/license/se/license.txt</header>
-                    <properties>
-                        <owner>Michael von Wenckstern</owner>
-                        <email>vonwenckstern@se-rwth.de</email>
-                    </properties>
-                    <excludes>
-                        <exclude>**/README</exclude>
-                        <exclude>src/test/resources/**</exclude>
-                        <exclude>src/main/resources/**</exclude>
-                        <exclude>src/license/**</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
+                    <groupId>com.mycila</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <version>3.0</version>
+                    <configuration>
+                        <header>${project.baseUri}/src/license/se/license.txt</header>
+                        <excludes>
+                            <exclude>**/README</exclude>
+                            <exclude>**/src/test/resources/**</exclude>
+                            <exclude>**/src/main/resources/**</exclude>
+                            <exclude>**/license/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>format</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/restful/Dockerfile b/restful/Dockerfile
index aac36cd0cc06b5a2a10d692a9a9d0954570ce926..9f2a48c462d442e9e2a4a3b9fd3f335644fa04f3 100644
--- a/restful/Dockerfile
+++ b/restful/Dockerfile
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 FROM openjdk:8-jdk
 
 WORKDIR /app
diff --git a/restful/README.md b/restful/README.md
index 7cb01bc22f15e43a0f78b461b2a4fbdd1e4a88e4..b72655f6c4c758d541ef1f6d5f435b0841f45612 100644
--- a/restful/README.md
+++ b/restful/README.md
@@ -1,5 +1,3 @@
-<!-- (c) https://github.com/MontiCore/monticore -->
-
 
 This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also
 retrieving the results.
diff --git a/restful/build.sh b/restful/build.sh
index 0456e620fea3768db66d8c426619bee004dfb268..0ae779d4f0ca13513a8732485d4df87f65ad3875 100644
--- a/restful/build.sh
+++ b/restful/build.sh
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 cp ./target/classes/app.db app.db
 cp ./target/restful-2.0.0.jar app.jar
diff --git a/restful/dev.yml b/restful/dev.yml
index a7508b7d9937cf6a7b9c3aa1526be0fe483b0fc2..57d28df3142fd99ce84e8a84525f9d3ba39f55c6 100644
--- a/restful/dev.yml
+++ b/restful/dev.yml
@@ -1,4 +1,10 @@
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 version: "3"
 
 services:
diff --git a/restful/openapi.yml b/restful/openapi.yml
index b6a7c2e53153296fe1a729c3737ee1ec4b3fc1d7..f0325698da08640ac4fa429e09730076b99e57e4 100644
--- a/restful/openapi.yml
+++ b/restful/openapi.yml
@@ -1,4 +1,10 @@
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 swagger: "2.0"
 info:
   description: "API doc for MontiSim server"
diff --git a/restful/pom.xml b/restful/pom.xml
index edd634d7a1d0574519581241ffa3feaaef8d653b..9f745b972ce47c2eef0387a784cee8706a1f0b52 100644
--- a/restful/pom.xml
+++ b/restful/pom.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -8,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4.RELEASE</version>
+        <version>2.1.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -19,7 +26,6 @@
 
     <properties>
         <montisim.simulation.version>2.0.2</montisim.simulation.version>
-
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -62,6 +68,7 @@
             <scope>compile</scope>
         </dependency>
 
+
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
@@ -209,6 +216,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <version>RELEASE</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                  <groupId>org.springframework.boot</groupId>
+                  <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+              </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -270,7 +283,7 @@
                 </executions>
             </plugin>
         </plugins>
-        <finalName>restful</finalName>
+        <!--<finalName>restful</finalName>-->
     </build>
 
     <distributionManagement>
diff --git a/restful/run_test.sh b/restful/run_test.sh
index 82da323c3f33558e90c26cda2ee5e7096af7a61b..4af55dea853c559f00eaf3cc962cdeab021ad129 100644
--- a/restful/run_test.sh
+++ b/restful/run_test.sh
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 # this script serves the purpose of running unitetests in gitlab-runner.
 # It starts all dependent services needed before starting the tests.
diff --git a/restful/src/main/java/server/restful/Server.java b/restful/src/main/java/server/restful/Server.java
index 654241daa9bac5eecdfe814da6d885296d5971dc..3d4daeb685ab470d2af97a9dc41f7dcbee8c4392 100644
--- a/restful/src/main/java/server/restful/Server.java
+++ b/restful/src/main/java/server/restful/Server.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful;
 
 import de.monticore.lang.montisim.simlang.SimLangTool;
diff --git a/restful/src/main/java/server/restful/SwaggerConfig.java b/restful/src/main/java/server/restful/SwaggerConfig.java
index 3e634d5839a54fe4ae2e21a060bf28c661cd1649..7998091d42fa14f0aa9b5c9c883bde4e207787a1 100644
--- a/restful/src/main/java/server/restful/SwaggerConfig.java
+++ b/restful/src/main/java/server/restful/SwaggerConfig.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful;
 
 import com.google.common.base.Predicates;
diff --git a/restful/src/main/java/server/restful/dao/BaseDAO.java b/restful/src/main/java/server/restful/dao/BaseDAO.java
index 3a87817b49998b5ff2c3b545de1ce03c5ec5950f..b406de6e36f36de87cf603a30dd03fa84e8f97ec 100644
--- a/restful/src/main/java/server/restful/dao/BaseDAO.java
+++ b/restful/src/main/java/server/restful/dao/BaseDAO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import org.slf4j.Logger;
diff --git a/restful/src/main/java/server/restful/dao/CarDAO.java b/restful/src/main/java/server/restful/dao/CarDAO.java
index 4c2dda6fbb50d1cfe1bf662450a772db7922e284..58e37164abf8db8b38db6fcece9a8bdc70d5947e 100644
--- a/restful/src/main/java/server/restful/dao/CarDAO.java
+++ b/restful/src/main/java/server/restful/dao/CarDAO.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import server.restful.model.CarModel;
diff --git a/restful/src/main/java/server/restful/dao/MapDAO.java b/restful/src/main/java/server/restful/dao/MapDAO.java
index 72c8921f0c68d649c1be00cc279dbfc0013ca656..acb4d8f1757c984568c76547b379aa7fbd8d8946 100644
--- a/restful/src/main/java/server/restful/dao/MapDAO.java
+++ b/restful/src/main/java/server/restful/dao/MapDAO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import server.restful.model.MapModel;
diff --git a/restful/src/main/java/server/restful/dao/ScenarioDAO.java b/restful/src/main/java/server/restful/dao/ScenarioDAO.java
index 06fc38d2f34edcfe8376ecd48c58e001e651ae26..ae6c0992336ce4ea1378473352248b6ca4ec7327 100644
--- a/restful/src/main/java/server/restful/dao/ScenarioDAO.java
+++ b/restful/src/main/java/server/restful/dao/ScenarioDAO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import server.restful.model.ScenarioModel;
diff --git a/restful/src/main/java/server/restful/dao/SimulationDAO.java b/restful/src/main/java/server/restful/dao/SimulationDAO.java
index fb094b13b3b88e7251e23f363cefe12ee3d64a20..37ce26055773ded63795fbcca5710954368630fe 100644
--- a/restful/src/main/java/server/restful/dao/SimulationDAO.java
+++ b/restful/src/main/java/server/restful/dao/SimulationDAO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/restful/src/main/java/server/restful/graph/MetisGraph.java b/restful/src/main/java/server/restful/graph/MetisGraph.java
index 12cf9e7a67e16267d99d5638b950f5deba41a55a..224d8a265d257cb273e51bda8f522069c9de2c41 100644
--- a/restful/src/main/java/server/restful/graph/MetisGraph.java
+++ b/restful/src/main/java/server/restful/graph/MetisGraph.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/main/java/server/restful/graph/OverlayUtil.java b/restful/src/main/java/server/restful/graph/OverlayUtil.java
index 798cdcf6c473d99d2eb41aeaeb3a0d06e1ad03b1..3cc59268de2b762ff42a87f3960c3ff8de51fe59 100644
--- a/restful/src/main/java/server/restful/graph/OverlayUtil.java
+++ b/restful/src/main/java/server/restful/graph/OverlayUtil.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java b/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java
index a41ee07c5e8fa2b86ac4c46f0202d4062d1d283c..febad9750fc85c2f14fad7c7a24a0d191c7863d6 100644
--- a/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java
+++ b/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph.structures;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.library.structures.Edge;
diff --git a/restful/src/main/java/server/restful/model/CarModel.java b/restful/src/main/java/server/restful/model/CarModel.java
index 716cdd765db0a488364691ece025e3ca8e62c43e..752fb47e10139f7cda23a3031478dc5ff29cf6df 100644
--- a/restful/src/main/java/server/restful/model/CarModel.java
+++ b/restful/src/main/java/server/restful/model/CarModel.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/restful/src/main/java/server/restful/model/Dataframe.java b/restful/src/main/java/server/restful/model/Dataframe.java
index 92f2928c113928a0694d89fc097940909bb3b1e9..73cf9bf21cee14f8184954e9fbcdeb003e4133de 100644
--- a/restful/src/main/java/server/restful/model/Dataframe.java
+++ b/restful/src/main/java/server/restful/model/Dataframe.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/restful/src/main/java/server/restful/model/MapModel.java b/restful/src/main/java/server/restful/model/MapModel.java
index 5f9e722a49568c659ad99805c1a027dd35279d33..0a7d89a32da9e44710bd91e774cbdefa2cfa3067 100644
--- a/restful/src/main/java/server/restful/model/MapModel.java
+++ b/restful/src/main/java/server/restful/model/MapModel.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 
diff --git a/restful/src/main/java/server/restful/model/OSMEdge.java b/restful/src/main/java/server/restful/model/OSMEdge.java
index ef5efa62940d61aee7b32e6a09b23d1b11806ae6..0ebd0f5bdf4d4ce0133c531cf3fff93ab0fbd144 100644
--- a/restful/src/main/java/server/restful/model/OSMEdge.java
+++ b/restful/src/main/java/server/restful/model/OSMEdge.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/main/java/server/restful/model/ScenarioModel.java b/restful/src/main/java/server/restful/model/ScenarioModel.java
index 5495d0f70d026296bd1d03d639f5c2f94d6ea377..25ebd3b755ae2e02ae0901bdf85d28724a343132 100644
--- a/restful/src/main/java/server/restful/model/ScenarioModel.java
+++ b/restful/src/main/java/server/restful/model/ScenarioModel.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/restful/src/main/java/server/restful/model/SimulationModel.java b/restful/src/main/java/server/restful/model/SimulationModel.java
index e09b197aa1973d116af269270d5ff00c9192249b..114a02b95b4ce4cf8bce027f13f18da6dab7866b 100644
--- a/restful/src/main/java/server/restful/model/SimulationModel.java
+++ b/restful/src/main/java/server/restful/model/SimulationModel.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 
diff --git a/restful/src/main/java/server/restful/model/VehicleModel.java b/restful/src/main/java/server/restful/model/VehicleModel.java
index 31b4cedc201abdc7c6c07338b81d715c5d86d43a..8ce32e2f690fd7909bdc999796b3e1f4d4726bb6 100644
--- a/restful/src/main/java/server/restful/model/VehicleModel.java
+++ b/restful/src/main/java/server/restful/model/VehicleModel.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/restful/src/main/java/server/restful/registry/DefaultRegistry.java b/restful/src/main/java/server/restful/registry/DefaultRegistry.java
index 21ce25751f2f515b8cfb31f1a32ff833337601e8..ade66f32a1a8d033e6e89a8325cf197575996cc1 100644
--- a/restful/src/main/java/server/restful/registry/DefaultRegistry.java
+++ b/restful/src/main/java/server/restful/registry/DefaultRegistry.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 /**
diff --git a/restful/src/main/java/server/restful/registry/RegistryFactory.java b/restful/src/main/java/server/restful/registry/RegistryFactory.java
index d4ca74864e5d714ac095a7d1cb702896d7c1a517..17ee55a5180dcad077457bd10e5921a8e11aee9c 100644
--- a/restful/src/main/java/server/restful/registry/RegistryFactory.java
+++ b/restful/src/main/java/server/restful/registry/RegistryFactory.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.I0Itec.zkclient.exception.ZkTimeoutException;
diff --git a/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java b/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java
index 915d096ce2d49e5196ec72089b130891c028a66a..eedfcf68cb3f6548c36da5b03026f638e0e3b9bf 100644
--- a/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java
+++ b/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 public class RemoteAutopilotService extends RemoteService{
diff --git a/restful/src/main/java/server/restful/registry/RemoteService.java b/restful/src/main/java/server/restful/registry/RemoteService.java
index 1db7c700183ee357bd1b6379f764cf02451f8a0b..1fa0f7a879801f5da2596c733df9e1ed69b3941d 100644
--- a/restful/src/main/java/server/restful/registry/RemoteService.java
+++ b/restful/src/main/java/server/restful/registry/RemoteService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java b/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java
index f76bc8175e1e26ea1ac11ee971cf07a00d0e0213..dc86065f65c47ad253aae1cdc87e1a4e2681c15b 100644
--- a/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java
+++ b/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import java.util.List;
diff --git a/restful/src/main/java/server/restful/registry/ServiceRegistry.java b/restful/src/main/java/server/restful/registry/ServiceRegistry.java
index 1dfc0de5773601d811a923095cff66e5535a564d..dcb3840e6d904de5617078453ea22a65f61dbf0e 100644
--- a/restful/src/main/java/server/restful/registry/ServiceRegistry.java
+++ b/restful/src/main/java/server/restful/registry/ServiceRegistry.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 public interface ServiceRegistry {
diff --git a/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java b/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java
index 48c16a10dfb99d23512c11789916fcfa5b2a6c3d..f543bd6c43b30109580db854a4e2377ba4b5029a 100644
--- a/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java
+++ b/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/main/java/server/restful/registry/util/Lock.java b/restful/src/main/java/server/restful/registry/util/Lock.java
index 2ccfaa9408c5a5ddd216abaa0ae1ee50e5a09923..02f019980c68f83ddcfe3b126d9ef8f0ab82bc23 100644
--- a/restful/src/main/java/server/restful/registry/util/Lock.java
+++ b/restful/src/main/java/server/restful/registry/util/Lock.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry.util;
 
 import org.I0Itec.zkclient.IZkDataListener;
diff --git a/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java b/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java
index 1be16eb6cd3683666842cecbfac1442dc4dcf119..26991c62ce6e154f287879a8df4311397a104379 100644
--- a/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java
+++ b/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry.util;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/main/java/server/restful/service/CarService.java b/restful/src/main/java/server/restful/service/CarService.java
index 2bf9f897e15525c8713a1ce56fadfc8521877b45..08fd0d6e43269a09b6b4da6fda403de8e550dd11 100644
--- a/restful/src/main/java/server/restful/service/CarService.java
+++ b/restful/src/main/java/server/restful/service/CarService.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import server.restful.dao.CarDAO;
diff --git a/restful/src/main/java/server/restful/service/MapService.java b/restful/src/main/java/server/restful/service/MapService.java
index 27d1bf096d7b5d01d39522cf93beea2145eceab8..e31505b261c3424137917552ee310f6169def644 100644
--- a/restful/src/main/java/server/restful/service/MapService.java
+++ b/restful/src/main/java/server/restful/service/MapService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/main/java/server/restful/service/NavigationService.java b/restful/src/main/java/server/restful/service/NavigationService.java
index 166dc327ede5554dd257eab81e2e34c97ec153b9..39be1b4e75735e1914516c94e3884a49d98883d5 100644
--- a/restful/src/main/java/server/restful/service/NavigationService.java
+++ b/restful/src/main/java/server/restful/service/NavigationService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/main/java/server/restful/service/ScenarioService.java b/restful/src/main/java/server/restful/service/ScenarioService.java
index c4739b592b62f44118c6e32f0edccd7179ba133a..a94ccd187d203ce321e4abfcc6559f5bb05a5ab3 100644
--- a/restful/src/main/java/server/restful/service/ScenarioService.java
+++ b/restful/src/main/java/server/restful/service/ScenarioService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import server.restful.dao.ScenarioDAO;
diff --git a/restful/src/main/java/server/restful/service/SimulationService.java b/restful/src/main/java/server/restful/service/SimulationService.java
index 4303e439ee7e408a53411a53ac4c4c8f34c2e022..2d4ca87f3703fe83a6db3c2b5b7615f767a90f55 100644
--- a/restful/src/main/java/server/restful/service/SimulationService.java
+++ b/restful/src/main/java/server/restful/service/SimulationService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.monticore.lang.montisim.carlang.CarContainer;
diff --git a/restful/src/main/java/server/restful/service/SimulatorService.java b/restful/src/main/java/server/restful/service/SimulatorService.java
index 10a285e211ef7804543495d1573a88fd3a41abcf..4c5c3973fca1b1cdc5c95cb469896270c19d4365 100644
--- a/restful/src/main/java/server/restful/service/SimulatorService.java
+++ b/restful/src/main/java/server/restful/service/SimulatorService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import com.google.protobuf.ByteString;
diff --git a/restful/src/main/java/server/restful/service/VehicleService.java b/restful/src/main/java/server/restful/service/VehicleService.java
index 9ab57444d683760e1103d094324ac619772d4fb3..5850a2004ef1a555233220ed7dbdfc7ca1747a53 100644
--- a/restful/src/main/java/server/restful/service/VehicleService.java
+++ b/restful/src/main/java/server/restful/service/VehicleService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/main/java/server/restful/service/WorldBuilderService.java b/restful/src/main/java/server/restful/service/WorldBuilderService.java
index bcc856c68050fbd2a10084a023620bc85d32a456..48c46847fd9f17e76a64d8607b6e7e7894135a6a 100644
--- a/restful/src/main/java/server/restful/service/WorldBuilderService.java
+++ b/restful/src/main/java/server/restful/service/WorldBuilderService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import org.slf4j.Logger;
diff --git a/restful/src/main/java/server/restful/util/Util.java b/restful/src/main/java/server/restful/util/Util.java
index 0d4e7cbb4ae617a252f3acc2ecc55fb6a91dac7e..4fdbd2019267d6171841150a3ab710be215e917d 100644
--- a/restful/src/main/java/server/restful/util/Util.java
+++ b/restful/src/main/java/server/restful/util/Util.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.util;
 
 import de.monticore.lang.montisim.carlang.CarContainer;
diff --git a/restful/src/main/java/server/restful/view/CarView.java b/restful/src/main/java/server/restful/view/CarView.java
index c27f1ef57f788eaa5221658f5817492fe5f81bad..311ca62af1ac2ce4b3cbc2869164c93a602a9f27 100644
--- a/restful/src/main/java/server/restful/view/CarView.java
+++ b/restful/src/main/java/server/restful/view/CarView.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.springframework.web.bind.annotation.*;
diff --git a/restful/src/main/java/server/restful/view/MapView.java b/restful/src/main/java/server/restful/view/MapView.java
index 86f5298bbfc2faf7c3864e87bb37a44f946ed704..bed4a9d34e9fd7d7d04321aa840ffcb5bdadf759 100644
--- a/restful/src/main/java/server/restful/view/MapView.java
+++ b/restful/src/main/java/server/restful/view/MapView.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.springframework.http.HttpStatus;
diff --git a/restful/src/main/java/server/restful/view/ScenarioView.java b/restful/src/main/java/server/restful/view/ScenarioView.java
index 5c42a32cd3bc5d709e26a5e526717cc9b4516943..4ad79716cc65169ec05e5aa5b8fc0bbffde62683 100644
--- a/restful/src/main/java/server/restful/view/ScenarioView.java
+++ b/restful/src/main/java/server/restful/view/ScenarioView.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.springframework.web.bind.annotation.*;
diff --git a/restful/src/main/java/server/restful/view/SimulationView.java b/restful/src/main/java/server/restful/view/SimulationView.java
index d4ac583fea896eae07a9ea9eb6f7926629809fcf..552790082ba351cfbad05992733fd33dc2d891b9 100644
--- a/restful/src/main/java/server/restful/view/SimulationView.java
+++ b/restful/src/main/java/server/restful/view/SimulationView.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.springframework.http.HttpStatus;
diff --git a/restful/src/main/resources/application.properties b/restful/src/main/resources/application.properties
index 297dba6d3c84b9b591db0f831546cfc84ed2061f..58edc967c259160bcdf67587cf5b5cf6c125cec4 100644
--- a/restful/src/main/resources/application.properties
+++ b/restful/src/main/resources/application.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 spring.cache.type=NONE
 spring.resources.chain.cache=true
 
diff --git a/restful/src/main/resources/config.properties b/restful/src/main/resources/config.properties
index f2e075d778fa1cff13958fa2b788ee23186fee08..9ab801aff92b932bbe642c51e419ddd97214be81 100644
--- a/restful/src/main/resources/config.properties
+++ b/restful/src/main/resources/config.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 visualization.static.path=/
 
 # whether to ignore altitude of the map
diff --git a/restful/src/main/resources/log4j.properties b/restful/src/main/resources/log4j.properties
index 07387cff3519d3945fa883495ff7bacf6f0e36ab..8b0e282349b3ffdbc2c82f7732d66513ae55baa9 100644
--- a/restful/src/main/resources/log4j.properties
+++ b/restful/src/main/resources/log4j.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 log4j.rootLogger=INFO,A1
 
 # A1 is set to be a ConsoleAppender.
diff --git a/restful/src/main/resources/model.py b/restful/src/main/resources/model.py
index 3e0ec67703d2fb2df4a7dfbbd59921e912733902..85976ab309791426038aafe8f5b46b2736c81aa6 100644
--- a/restful/src/main/resources/model.py
+++ b/restful/src/main/resources/model.py
@@ -1,4 +1,10 @@
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 from peewee import *
 
 db = SqliteDatabase("app.db")
diff --git a/restful/src/test/java/server/restful/api/ServerTest.java b/restful/src/test/java/server/restful/api/ServerTest.java
index 277d36f96afefceb604827e5cc2561ec71f10b1e..35980950e5e6505f1427017279b0b3d5096960e6 100644
--- a/restful/src/test/java/server/restful/api/ServerTest.java
+++ b/restful/src/test/java/server/restful/api/ServerTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.api;
 
 import org.junit.Test;
diff --git a/restful/src/test/java/server/restful/dao/MapDAOTest.java b/restful/src/test/java/server/restful/dao/MapDAOTest.java
index 45f07d56ca3363d6768a6709a0d3177734db3f85..1dfeb04b409dca43243dbd53e7642f7f695f3184 100644
--- a/restful/src/test/java/server/restful/dao/MapDAOTest.java
+++ b/restful/src/test/java/server/restful/dao/MapDAOTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import org.junit.Before;
diff --git a/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java b/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java
index 70bdbf7b25d948428cd0e0f09ca983650b90d83a..974fcb1d23910f887b2a16afd6e5e65ab34256f1 100644
--- a/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java
+++ b/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import org.junit.Before;
diff --git a/restful/src/test/java/server/restful/dao/SimulationDAOTest.java b/restful/src/test/java/server/restful/dao/SimulationDAOTest.java
index 2a705d053a10937a9dc4ab06520051ec4da132ae..e7f0742d05bfebec1e671f9ec10eb08ce78e9376 100644
--- a/restful/src/test/java/server/restful/dao/SimulationDAOTest.java
+++ b/restful/src/test/java/server/restful/dao/SimulationDAOTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import org.junit.Before;
diff --git a/restful/src/test/java/server/restful/graph/MetisGraphTest.java b/restful/src/test/java/server/restful/graph/MetisGraphTest.java
index faad3ed203d507a3084684f2fa5efa133c5a369a..f082f372b685a073cf0c2014e19d8077911b8db0 100644
--- a/restful/src/test/java/server/restful/graph/MetisGraphTest.java
+++ b/restful/src/test/java/server/restful/graph/MetisGraphTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph;
 
 import org.junit.Assume;
diff --git a/restful/src/test/java/server/restful/graph/OverlayUtilTest.java b/restful/src/test/java/server/restful/graph/OverlayUtilTest.java
index 8f1d1640e2737f7adac23249348f105127027f3b..e27d577e8e4a297d8c5e93e2fb2d9c41b27af071 100644
--- a/restful/src/test/java/server/restful/graph/OverlayUtilTest.java
+++ b/restful/src/test/java/server/restful/graph/OverlayUtilTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java b/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java
index 74f948cf03bc78e2212bf6a144981186847185b9..8de710090506a17718760d877e129a55ccfc54c2 100644
--- a/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java
+++ b/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.junit.Test;
diff --git a/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java b/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java
index 1eaf74e864e6f79811273ea3314ae6cefcc4c138..1c37486c44a7a17fe01481b7cdafa9b51e2d0bf2 100644
--- a/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java
+++ b/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.junit.Test;
diff --git a/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java b/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java
index 041432985d7c285a2e8e1554e1e57fa8d5464ef1..ec0aa77c66e7fa9a4a31bd622f9a5596b6fd85bd 100644
--- a/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java
+++ b/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java b/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java
index 3c5135523a046f06025ce180f43d1bae2c848289..3a461ac403acae0c24a80a2f22fa1a174cbaf61a 100644
--- a/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java
+++ b/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java b/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java
index 5b2353caab2f8e0889b30cea80d9fd4f0294d83d..19b2340d3e492fc897f4049cbc04b90e9f4e4810 100644
--- a/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java
+++ b/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/test/java/server/restful/registry/util/LockTest.java b/restful/src/test/java/server/restful/registry/util/LockTest.java
index 376824a40c207d885a606a573505ad6e90ca5a68..ee5643785a24e2fdeaa749e9096e076784f6feb7 100644
--- a/restful/src/test/java/server/restful/registry/util/LockTest.java
+++ b/restful/src/test/java/server/restful/registry/util/LockTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.registry.util;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/restful/src/test/java/server/restful/service/MapServiceTest.java b/restful/src/test/java/server/restful/service/MapServiceTest.java
index 7b837675bc64705f9ce781c017c9f19810ecc7da..7b5e3514dd682618c8a7467512206d399d898015 100644
--- a/restful/src/test/java/server/restful/service/MapServiceTest.java
+++ b/restful/src/test/java/server/restful/service/MapServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/test/java/server/restful/service/NavigationServiceTest.java b/restful/src/test/java/server/restful/service/NavigationServiceTest.java
index 35f2b6572fef07d3cac1e4b62976031483578593..3c66cedd36c4f6ddd41a65f74ca1f1067d145026 100644
--- a/restful/src/test/java/server/restful/service/NavigationServiceTest.java
+++ b/restful/src/test/java/server/restful/service/NavigationServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/test/java/server/restful/service/SimulationServiceTest.java b/restful/src/test/java/server/restful/service/SimulationServiceTest.java
index a898fea91d48e06e7481e016488fea84a3299596..df4e7ebe3f50c80ad6a9e8fca691845af4f29b5e 100644
--- a/restful/src/test/java/server/restful/service/SimulationServiceTest.java
+++ b/restful/src/test/java/server/restful/service/SimulationServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import junit.framework.TestCase;
diff --git a/restful/src/test/java/server/restful/service/VehicleServiceTest.java b/restful/src/test/java/server/restful/service/VehicleServiceTest.java
index 2da728afaafc67602505018f240394b970aa087f..540b0fedf219b0ed1f7d2577d2e3a74384e03a20 100644
--- a/restful/src/test/java/server/restful/service/VehicleServiceTest.java
+++ b/restful/src/test/java/server/restful/service/VehicleServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java b/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java
index 323d1c85297bcaa10d32333cf38ec24807540aa9..71cbbc7327e2c3789a9399815918078366c7815c 100644
--- a/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java
+++ b/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.service;
 
 import org.junit.Test;
diff --git a/restful/src/test/java/server/restful/view/AbstractViewTest.java b/restful/src/test/java/server/restful/view/AbstractViewTest.java
index cc9069b14d39398e4bfa18e8a1e6bb35b0dfe8dd..eb48094883c76351614d2ab5559bc8f5280074b9 100644
--- a/restful/src/test/java/server/restful/view/AbstractViewTest.java
+++ b/restful/src/test/java/server/restful/view/AbstractViewTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.junit.Before;
diff --git a/restful/src/test/java/server/restful/view/MapViewTest.java b/restful/src/test/java/server/restful/view/MapViewTest.java
index 533a8eb9c99d43aa02659b7a2b3fc1ee524d0361..ee493b0fec3dd6567ffc54e0a362e4ca067a2bb0 100644
--- a/restful/src/test/java/server/restful/view/MapViewTest.java
+++ b/restful/src/test/java/server/restful/view/MapViewTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.junit.Assert;
diff --git a/restful/src/test/java/server/restful/view/ScenarioViewTest.java b/restful/src/test/java/server/restful/view/ScenarioViewTest.java
index 4f59df353db095ba5a88a9d31efd78068e0005de..b506e4bf790a4362c0dc296e2b48c992348bd56d 100644
--- a/restful/src/test/java/server/restful/view/ScenarioViewTest.java
+++ b/restful/src/test/java/server/restful/view/ScenarioViewTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.junit.Assert;
diff --git a/restful/src/test/java/server/restful/view/SimulationViewTest.java b/restful/src/test/java/server/restful/view/SimulationViewTest.java
index fff98cbb140d4970ed7a218cefde25bcf6de2d3d..5185ec5d1484b7c52b313390eae43dc958edeb57 100644
--- a/restful/src/test/java/server/restful/view/SimulationViewTest.java
+++ b/restful/src/test/java/server/restful/view/SimulationViewTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.view;
 
 import org.junit.Assert;
diff --git a/restful/src/test/resources/aachen.sim b/restful/src/test/resources/aachen.sim
index 23de36a3b7980ca380a42aa982a740bb57e874de..bfb8fc213d63fa05b887eb82ee36bae86bcc4b14 100644
--- a/restful/src/test/resources/aachen.sim
+++ b/restful/src/test/resources/aachen.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 4h;
 
diff --git a/restful/src/test/resources/config.properties b/restful/src/test/resources/config.properties
index 1fcdc9934833a92bd1a82e75fd90a3cd1508a330..db0619d56dde85dc1a8e6266a7267cb69b18a4f1 100644
--- a/restful/src/test/resources/config.properties
+++ b/restful/src/test/resources/config.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 visualization.static.path=/
 
 flat_map=true
diff --git a/restful/src/test/resources/log4j.properties b/restful/src/test/resources/log4j.properties
index 956fa0081e0a9ff59feddd650a51f40d41eaf9eb..d267552cf3197824457042890d9928b3366412ed 100644
--- a/restful/src/test/resources/log4j.properties
+++ b/restful/src/test/resources/log4j.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 log4j.rootLogger=DEBUG,A1
 
 # A1 is set to be a ConsoleAppender.
diff --git a/restful/src/test/resources/straight.sim b/restful/src/test/resources/straight.sim
index f0642b6f710e20f922bb6b4a159f30055eaad349..d038d3c98071481a92fa2c5bcd5e5c3c89cb85e7 100644
--- a/restful/src/test/resources/straight.sim
+++ b/restful/src/test/resources/straight.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim LowFriction {
   sim_duration 4h;
 
diff --git a/restful/src/test/resources/straight_2_cars.sim b/restful/src/test/resources/straight_2_cars.sim
index 879997526a6bb21ee62763c95d1d4ff3b55f9666..1ecbb6af0bbf25841b0b5520902bd35ba2e14382 100644
--- a/restful/src/test/resources/straight_2_cars.sim
+++ b/restful/src/test/resources/straight_2_cars.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim LowFriction {
   sim_duration 4h;
 
diff --git a/restful/src/test/resources/straight_long_distance.sim b/restful/src/test/resources/straight_long_distance.sim
index db6d576592009739f038c25686509825662b6efa..62ea32735f52bd05a08b17bebd7f74cd8e1fa9bc 100644
--- a/restful/src/test/resources/straight_long_distance.sim
+++ b/restful/src/test/resources/straight_long_distance.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim LowFriction {
   sim_duration 4h;
 
diff --git a/rpc/Dockerfile b/rpc/Dockerfile
index 37fde3415f1f2aca01ed49523c8bd7087628ec68..1d410982e8ce1560575faf01b70041672b693df4 100644
--- a/rpc/Dockerfile
+++ b/rpc/Dockerfile
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 FROM openjdk:8-jdk
 
 WORKDIR /app
diff --git a/rpc/README.md b/rpc/README.md
index a113fed983db2a57bdfb63523d1783fb5cf1c0d6..45ae0735e8e544cdb534aea20fa4f38255cd6325 100644
--- a/rpc/README.md
+++ b/rpc/README.md
@@ -1,4 +1,3 @@
-<!-- (c) https://github.com/MontiCore/monticore -->
 This module implements a gRPC wrapper for MontiSim simulator.
 
 ## Install
diff --git a/rpc/build.sh b/rpc/build.sh
index 8f4165f60d9caddbf130e803d8f1c08c6d419807..247e30d7558517bf99f839f6a79c86401003046f 100644
--- a/rpc/build.sh
+++ b/rpc/build.sh
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-# (c) https://github.com/MontiCore/monticore  
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 cp ../libs/fmu_for_linux/* ./
 cp ./target/rpc-2.0.0-jar-with-dependencies.jar ./simulator-rpc.jar
diff --git a/rpc/pom.xml b/rpc/pom.xml
index 39d9b192a78e816481849d487d709e9905757209..65a17927de99ef7947803f0fed265cea1d93031c 100644
--- a/rpc/pom.xml
+++ b/rpc/pom.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,13 +14,13 @@
 
     <groupId>montisim</groupId>
     <artifactId>rpc</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1</version>
 
 
     <properties>
-        <montisim.commons.version>1.0.9</montisim.commons.version>
+        <montisim.commons.version>1.0.10</montisim.commons.version>
         <montisim.simulation.version>2.0.2</montisim.simulation.version>
-        <montisim.controller.version>1.0.3</montisim.controller.version>
+        <montisim.controller.version>1.0.4</montisim.controller.version>
         <montisim.carlang.version>1.0.2</montisim.carlang.version>
     </properties>
 
diff --git a/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java b/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java
index 66805ae1c6664864be27de7bdce70166b0fc2288..68f19d8466324380599ad7d9659a17b3aab62367 100644
--- a/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java
+++ b/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.adapters.AutoPilot;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.BusEntry;
diff --git a/rpc/src/main/java/server/adapters/AutoPilot/FullSpeedStraight.java b/rpc/src/main/java/server/adapters/AutoPilot/FullSpeedStraight.java
index 60c958808f2be3be8d54a81ff758c053725dad19..11f44b6e71c5f81e733e9af7c37ca028bb7c88c4 100644
--- a/rpc/src/main/java/server/adapters/AutoPilot/FullSpeedStraight.java
+++ b/rpc/src/main/java/server/adapters/AutoPilot/FullSpeedStraight.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.adapters.AutoPilot;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.BusEntry;
diff --git a/rpc/src/main/java/server/adapters/AutoPilot/StandStill.java b/rpc/src/main/java/server/adapters/AutoPilot/StandStill.java
index bf869d87ff0ef1e44b4c47aaa1fd5df8cabb7959..1713e8a9ba43228180af346033b1704eba64c72a 100644
--- a/rpc/src/main/java/server/adapters/AutoPilot/StandStill.java
+++ b/rpc/src/main/java/server/adapters/AutoPilot/StandStill.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.adapters.AutoPilot;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.BusEntry;
diff --git a/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java b/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java
index 11718907af76c5bd9458aa50abf7a258fa35cab2..02840cbbc5f5b23e20a64cf565ea4ed00af43791 100644
--- a/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java
+++ b/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.adapters.interfaces;
 
 import java.rmi.Remote;
diff --git a/rpc/src/main/java/server/adapters/util/RMIClient.java b/rpc/src/main/java/server/adapters/util/RMIClient.java
index 607e4dd937bff0ff15c5c20b87b07f94cb0d3626..90818f72379e9e18626ae3c14fb54a103ca066b2 100644
--- a/rpc/src/main/java/server/adapters/util/RMIClient.java
+++ b/rpc/src/main/java/server/adapters/util/RMIClient.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.adapters.util;
 
 import org.apache.log4j.Logger;
diff --git a/rpc/src/main/java/server/errorflags/CollisionDeterminator.java b/rpc/src/main/java/server/errorflags/CollisionDeterminator.java
index 9402468e4f55df892a6f78ac855303970df618bf..cc87454dfc896489d6316a06caf92fc3e37c8c9b 100644
--- a/rpc/src/main/java/server/errorflags/CollisionDeterminator.java
+++ b/rpc/src/main/java/server/errorflags/CollisionDeterminator.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.errorflags;
 
 import simulation.vehicle.PhysicalVehicle;
diff --git a/rpc/src/main/java/server/errorflags/ErrorDeterminator.java b/rpc/src/main/java/server/errorflags/ErrorDeterminator.java
index b93a8784d361b429047f66e85a23e1d8ffda9a0e..f7b7b0c97b50fd007fa370e4fb3d55dae2af4585 100644
--- a/rpc/src/main/java/server/errorflags/ErrorDeterminator.java
+++ b/rpc/src/main/java/server/errorflags/ErrorDeterminator.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.errorflags;
 
 /**
diff --git a/rpc/src/main/java/server/errorflags/ErrorDeterminatorProcessor.java b/rpc/src/main/java/server/errorflags/ErrorDeterminatorProcessor.java
index 4be14078d1c9136d335504832e20a36b0819ef83..d0fa63989e7fc557931435fc18e22f76e349a032 100644
--- a/rpc/src/main/java/server/errorflags/ErrorDeterminatorProcessor.java
+++ b/rpc/src/main/java/server/errorflags/ErrorDeterminatorProcessor.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.errorflags;
 
 import java.util.ArrayList;
diff --git a/rpc/src/main/java/server/errorflags/ErrorFlag.java b/rpc/src/main/java/server/errorflags/ErrorFlag.java
index 405fdd7c7f95265bfbff7f31dd28069b68c1dd44..cda62e06f8306b5598fe898c9f55f65a0013724a 100644
--- a/rpc/src/main/java/server/errorflags/ErrorFlag.java
+++ b/rpc/src/main/java/server/errorflags/ErrorFlag.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.errorflags;
 
 /* this enum determines the semantics of the errorFlags entry in a simulation frame */
diff --git a/rpc/src/main/java/server/errorflags/SimFrameInfo.java b/rpc/src/main/java/server/errorflags/SimFrameInfo.java
index 5b2e3762b695bc101f769bba377fcf61524c77c2..ecc7edf88f88f9564a8534258bf8d3ea0ded2e1e 100644
--- a/rpc/src/main/java/server/errorflags/SimFrameInfo.java
+++ b/rpc/src/main/java/server/errorflags/SimFrameInfo.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.errorflags;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.simulation.SimulationLoopExecutable;
diff --git a/rpc/src/main/java/server/errorflags/VehicleLeftRoadDeterminator.java b/rpc/src/main/java/server/errorflags/VehicleLeftRoadDeterminator.java
index 183104b2beca3acab4a7b9ab710176fcedac48a4..c3af99ac9298a80a273f5195a95b7922002387e0 100644
--- a/rpc/src/main/java/server/errorflags/VehicleLeftRoadDeterminator.java
+++ b/rpc/src/main/java/server/errorflags/VehicleLeftRoadDeterminator.java
@@ -1,3 +1,9 @@
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.errorflags;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.simulation.PhysicalObject;
diff --git a/rpc/src/main/java/server/rpc/RegistableService.java b/rpc/src/main/java/server/rpc/RegistableService.java
index 670ee1044b798ee34baff8d451f8938c97aa75aa..9b34d304f74d561a67e69e944c1b6d8034d167cc 100644
--- a/rpc/src/main/java/server/rpc/RegistableService.java
+++ b/rpc/src/main/java/server/rpc/RegistableService.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.rpc;
 
 import org.I0Itec.zkclient.ZkClient;
diff --git a/rpc/src/main/java/server/rpc/RpcServer.java b/rpc/src/main/java/server/rpc/RpcServer.java
index 424b9ba7bf373c4820964521243bd463516e6a26..46df7aa80d1a319c2360524ab8add7327a962ab3 100644
--- a/rpc/src/main/java/server/rpc/RpcServer.java
+++ b/rpc/src/main/java/server/rpc/RpcServer.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.rpc;
 
 import io.grpc.Server;
diff --git a/rpc/src/main/java/server/rpc/SimulationControllerImpl.java b/rpc/src/main/java/server/rpc/SimulationControllerImpl.java
index ebdb436ab95b55cdb74323e46ff51aca795377a0..836570c1f3f11412cc6a40f673fc2b8397bf28ac 100644
--- a/rpc/src/main/java/server/rpc/SimulationControllerImpl.java
+++ b/rpc/src/main/java/server/rpc/SimulationControllerImpl.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.rpc;
 
 import com.google.protobuf.ByteString;
diff --git a/rpc/src/main/java/server/rpc/SimulationObserver.java b/rpc/src/main/java/server/rpc/SimulationObserver.java
index a13f53853b503a3fd97ec31445ca3a6e4680eb05..80243ae8f9d56c07c6248cd84b11df7f1647a288 100644
--- a/rpc/src/main/java/server/rpc/SimulationObserver.java
+++ b/rpc/src/main/java/server/rpc/SimulationObserver.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.rpc;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.BusEntry;
diff --git a/rpc/src/main/java/server/rpc/Utils.java b/rpc/src/main/java/server/rpc/Utils.java
index 9f8b4f177ef85babc57b2d7e530b04696fe7e490..d58db89e1eef20a3d7434225ef15693d7b9ec319 100644
--- a/rpc/src/main/java/server/rpc/Utils.java
+++ b/rpc/src/main/java/server/rpc/Utils.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.rpc;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
diff --git a/rpc/src/main/resources/log4j.properties b/rpc/src/main/resources/log4j.properties
index 07387cff3519d3945fa883495ff7bacf6f0e36ab..8b0e282349b3ffdbc2c82f7732d66513ae55baa9 100644
--- a/rpc/src/main/resources/log4j.properties
+++ b/rpc/src/main/resources/log4j.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 log4j.rootLogger=INFO,A1
 
 # A1 is set to be a ConsoleAppender.
diff --git a/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java b/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java
index 2ddf1bb68a53863d39278f81b720c16fc298649c..c839f97f676768f1db5f0d778300f18c9efa1c31 100644
--- a/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java
+++ b/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.rpc;
 
 import de.monticore.lang.montisim.carlang.CarContainer;
diff --git a/rpc/src/test/resources/log4j.properties b/rpc/src/test/resources/log4j.properties
index 956fa0081e0a9ff59feddd650a51f40d41eaf9eb..d267552cf3197824457042890d9928b3366412ed 100644
--- a/rpc/src/test/resources/log4j.properties
+++ b/rpc/src/test/resources/log4j.properties
@@ -1,3 +1,10 @@
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 log4j.rootLogger=DEBUG,A1
 
 # A1 is set to be a ConsoleAppender.
diff --git a/settings.xml b/settings.xml
index 4f7dc3f09b271e2a92f5e226ff7a3ed621947860..63770c903f90d90d3d65c575be98edcd4fd9f952 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
 
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
diff --git a/src/license/se/license.txt b/src/license/se/license.txt
index 4982734019dc2ebdc09e2707c5d9791e39748a6d..39976e268bbc326749f81772f9cb483fd9e082a5 100644
--- a/src/license/se/license.txt
+++ b/src/license/se/license.txt
@@ -1,5 +1,4 @@
 (c) https://github.com/MontiCore/monticore
 
 The license generally applicable for this project 
-can be found under https://github.com/MontiCore/monticore.
-
+can be found under https://github.com/MontiCore/monticore.
\ No newline at end of file
diff --git a/src/main/java/rwth/server/bo/EnvObjectBO.java b/src/main/java/rwth/server/bo/EnvObjectBO.java
index 249d1a5ebf7d4fc5ae2778b7f4cf4b6edb8e2eb1..8d79c6d83aee899e0ca650e39d84f0dc1eab4ec1 100644
--- a/src/main/java/rwth/server/bo/EnvObjectBO.java
+++ b/src/main/java/rwth/server/bo/EnvObjectBO.java
@@ -1,9 +1,14 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo;
 
 import java.util.List;
 
-import javafx.geometry.Point2D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point2D;
 import rwth.server.dao.EnvNodeDao;
 import rwth.server.dao.EnvObjectDao;
 import rwth.server.dao.HeightDao;
diff --git a/src/main/java/rwth/server/bo/MapBO.java b/src/main/java/rwth/server/bo/MapBO.java
index 39635f02a2463953e1b8bf205b2fecb287bb7479..64d7c4da9f40be355f187cc89796d12ec74c45b3 100644
--- a/src/main/java/rwth/server/bo/MapBO.java
+++ b/src/main/java/rwth/server/bo/MapBO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo;
 
 import rwth.server.dao.MapDao;
diff --git a/src/main/java/rwth/server/bo/ScenarioBO.java b/src/main/java/rwth/server/bo/ScenarioBO.java
index c6ef76fa1c8b6e7e12e98dac15c70546b00cb903..bba6008145ecfe216a5bfce0ec98abe11c8fbdc9 100644
--- a/src/main/java/rwth/server/bo/ScenarioBO.java
+++ b/src/main/java/rwth/server/bo/ScenarioBO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo;
 
 import java.util.List;
diff --git a/src/main/java/rwth/server/bo/SectorBO.java b/src/main/java/rwth/server/bo/SectorBO.java
index 14fd6b43ff957cc2cb75a90d6b0b1d058907c82e..e163c6f2c92e354392b58a2d8aca276dcc7d238c 100644
--- a/src/main/java/rwth/server/bo/SectorBO.java
+++ b/src/main/java/rwth/server/bo/SectorBO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo;
 
 import java.util.HashMap;
diff --git a/src/main/java/rwth/server/bo/UsersBO.java b/src/main/java/rwth/server/bo/UsersBO.java
index 132e721031f245a1cdbf831e364f2c79b7fcf758..42abad64d9b7a717388b128fcf5fad52b898add9 100644
--- a/src/main/java/rwth/server/bo/UsersBO.java
+++ b/src/main/java/rwth/server/bo/UsersBO.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo;
 
 import com.smartfoxserver.bitswarm.sessions.ISession;
diff --git a/src/main/java/rwth/server/bo/WorldBuilder.java b/src/main/java/rwth/server/bo/WorldBuilder.java
index 205b32407a343ef7c651f76421f6d3556d0119e1..e891197f8eb6fd8ad6efb258ae741ffd731fb9bf 100644
--- a/src/main/java/rwth/server/bo/WorldBuilder.java
+++ b/src/main/java/rwth/server/bo/WorldBuilder.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo;
 
 import java.io.InputStream;
diff --git a/src/main/java/rwth/server/bo/util/ApiManager.java b/src/main/java/rwth/server/bo/util/ApiManager.java
index 2e7f9c1bb2c21a45e01e29ae1ef9a85faa7251f5..d86f876f8687754b48de06f8add707e0e8a0ce64 100644
--- a/src/main/java/rwth/server/bo/util/ApiManager.java
+++ b/src/main/java/rwth/server/bo/util/ApiManager.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo.util;
 
 import com.smartfoxserver.v2.api.ISFSApi;
diff --git a/src/main/java/rwth/server/bo/util/Logger.java b/src/main/java/rwth/server/bo/util/Logger.java
index 362425ab922a193a16a5ed9afa03e1183a6e84d0..d6da51ca935b5000a2a9b82e290860f344aca029 100644
--- a/src/main/java/rwth/server/bo/util/Logger.java
+++ b/src/main/java/rwth/server/bo/util/Logger.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.bo.util;
 
 import com.smartfoxserver.v2.extensions.BaseSFSExtension;
diff --git a/src/main/java/rwth/server/dao/AreaDao.java b/src/main/java/rwth/server/dao/AreaDao.java
index c3dc4b328d07555b197c6b20fc83d22574f356da..397f71094ebeb96e3dd22771b96d91f296e997ea 100644
--- a/src/main/java/rwth/server/dao/AreaDao.java
+++ b/src/main/java/rwth/server/dao/AreaDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.SQLException;
diff --git a/src/main/java/rwth/server/dao/EnvNodeDao.java b/src/main/java/rwth/server/dao/EnvNodeDao.java
index d17dbb0d3978f0e87a3c9f064fc7561471e0e24c..64c3fda12b6b8cba0a702c086bbce0a563257564 100644
--- a/src/main/java/rwth/server/dao/EnvNodeDao.java
+++ b/src/main/java/rwth/server/dao/EnvNodeDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.Connection;
@@ -13,7 +18,7 @@ import com.smartfoxserver.v2.entities.data.ISFSArray;
 import com.smartfoxserver.v2.entities.data.ISFSObject;
 import com.smartfoxserver.v2.extensions.ExtensionLogLevel;
 
-import javafx.geometry.Point3D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point3D;
 import rwth.server.bo.util.Logger;
 import rwth.server.dao.util.DataAccessUtils;
 import rwth.server.dao.util.DataConverter;
diff --git a/src/main/java/rwth/server/dao/EnvObjectDao.java b/src/main/java/rwth/server/dao/EnvObjectDao.java
index 5acbf8a3d72946c5cccf0be3afff596eab3fa5c2..130fd04884a0408dbd8c4ce40f2872c5c904a51c 100644
--- a/src/main/java/rwth/server/dao/EnvObjectDao.java
+++ b/src/main/java/rwth/server/dao/EnvObjectDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.SQLException;
diff --git a/src/main/java/rwth/server/dao/HeightDao.java b/src/main/java/rwth/server/dao/HeightDao.java
index 4d59642bf05e4139bd28e6cc3b23693383e2f6d1..d9208e61080e83558d16f6d77eab866d7bb1b418 100644
--- a/src/main/java/rwth/server/dao/HeightDao.java
+++ b/src/main/java/rwth/server/dao/HeightDao.java
@@ -1,11 +1,16 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import com.smartfoxserver.v2.db.IDBManager;
 import com.smartfoxserver.v2.entities.data.ISFSArray;
 import com.smartfoxserver.v2.entities.data.ISFSObject;
 import com.smartfoxserver.v2.extensions.ExtensionLogLevel;
-import javafx.geometry.Point2D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point2D;
 import rwth.server.bo.util.Logger;
 import rwth.server.dao.util.DataAccessUtils;
 
diff --git a/src/main/java/rwth/server/dao/MapDao.java b/src/main/java/rwth/server/dao/MapDao.java
index 222b08614154022aedf33a9b77f8df0eecd161f1..756defe7d2a365390514f7929238fc522626c02b 100644
--- a/src/main/java/rwth/server/dao/MapDao.java
+++ b/src/main/java/rwth/server/dao/MapDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.SQLException;
diff --git a/src/main/java/rwth/server/dao/ScenarioDao.java b/src/main/java/rwth/server/dao/ScenarioDao.java
index 52071d205d0680bb384fc035590cd6634756ce0f..ab4bb5999187da11164d5a457f1a0de5dbe29925 100644
--- a/src/main/java/rwth/server/dao/ScenarioDao.java
+++ b/src/main/java/rwth/server/dao/ScenarioDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.Connection;
diff --git a/src/main/java/rwth/server/dao/SectorDao.java b/src/main/java/rwth/server/dao/SectorDao.java
index 2f466340be041781fef454b0c82acac2ff5b7ac6..a7d37e2147f67d57927ad6cc69de398cf26706df 100644
--- a/src/main/java/rwth/server/dao/SectorDao.java
+++ b/src/main/java/rwth/server/dao/SectorDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.SQLException;
diff --git a/src/main/java/rwth/server/dao/StreetDao.java b/src/main/java/rwth/server/dao/StreetDao.java
index 8e25b7e7f186aecb87f569a762683139a7f0e99a..4898dae7f166a7686ac5f089343f1f415c113b7c 100644
--- a/src/main/java/rwth/server/dao/StreetDao.java
+++ b/src/main/java/rwth/server/dao/StreetDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import com.smartfoxserver.v2.db.IDBManager;
diff --git a/src/main/java/rwth/server/dao/UsersDao.java b/src/main/java/rwth/server/dao/UsersDao.java
index 3b6b095b774a7bf0b496aab9ff034cff196abe79..39e6726061f4f9f39699abc68dbaf2d1dedee332 100644
--- a/src/main/java/rwth/server/dao/UsersDao.java
+++ b/src/main/java/rwth/server/dao/UsersDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.SQLException;
diff --git a/src/main/java/rwth/server/dao/WaterwayDao.java b/src/main/java/rwth/server/dao/WaterwayDao.java
index eb8922a2807c1c27674ebca79090617c8458728b..1f6d2b90f4d56ac330adba62df0191553a96f0cf 100644
--- a/src/main/java/rwth/server/dao/WaterwayDao.java
+++ b/src/main/java/rwth/server/dao/WaterwayDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao;
 
 import java.sql.SQLException;
diff --git a/src/main/java/rwth/server/dao/util/DataAccessUtils.java b/src/main/java/rwth/server/dao/util/DataAccessUtils.java
index 416937b183466fbfa1526eead6cfbb7cc935d269..057cdacfeb6b4383146a8e35dabee503b35293a9 100644
--- a/src/main/java/rwth/server/dao/util/DataAccessUtils.java
+++ b/src/main/java/rwth/server/dao/util/DataAccessUtils.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao.util;
 
 import java.sql.Connection;
diff --git a/src/main/java/rwth/server/dao/util/DataConverter.java b/src/main/java/rwth/server/dao/util/DataConverter.java
index a826ded6e47de69d1e8a29ccc0cd411ff3539d49..91fe7ec639ad4c723e09e342f35ef19d5beb685f 100644
--- a/src/main/java/rwth/server/dao/util/DataConverter.java
+++ b/src/main/java/rwth/server/dao/util/DataConverter.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.dao.util;
 
 public class DataConverter {
diff --git a/src/main/java/rwth/server/extensions/RoomExt.java b/src/main/java/rwth/server/extensions/RoomExt.java
index 942f4ebe08306bbaa69827d75afa53cee2235924..fcf3d90da7b69faf0b2913965a3562910d352914 100644
--- a/src/main/java/rwth/server/extensions/RoomExt.java
+++ b/src/main/java/rwth/server/extensions/RoomExt.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.extensions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/rwth/server/extensions/ZoneExt.java b/src/main/java/rwth/server/extensions/ZoneExt.java
index 24b9155de6bcd984ada7acc7c4a1d06b282f2b57..e785617b38c03c9581df41741d7f49a53fd9123b 100644
--- a/src/main/java/rwth/server/extensions/ZoneExt.java
+++ b/src/main/java/rwth/server/extensions/ZoneExt.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.extensions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/rwth/server/pathfinder/NavigationPath.java b/src/main/java/rwth/server/pathfinder/NavigationPath.java
index aa0f1d09e33d81bb8adfdeca63db402da48ffb10..78f64d250e74f26124ddb3951b44dab677a99956 100644
--- a/src/main/java/rwth/server/pathfinder/NavigationPath.java
+++ b/src/main/java/rwth/server/pathfinder/NavigationPath.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pathfinder;
 
 public class NavigationPath {
diff --git a/src/main/java/rwth/server/pathfinder/PathDao.java b/src/main/java/rwth/server/pathfinder/PathDao.java
index e6de066a0478398426d52297a8e6efb600a7473f..6e64d089e7d398ab10be413ad376d49b8a3034ce 100644
--- a/src/main/java/rwth/server/pathfinder/PathDao.java
+++ b/src/main/java/rwth/server/pathfinder/PathDao.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pathfinder;
 
 import java.sql.Connection;
diff --git a/src/main/java/rwth/server/pathfinder/PathFinder.java b/src/main/java/rwth/server/pathfinder/PathFinder.java
index 25f033d9619ebbd164aabe769b3423e1d4ba8a1d..6f2d54ac464a104f040c700a3a01177bd6f04c2c 100644
--- a/src/main/java/rwth/server/pathfinder/PathFinder.java
+++ b/src/main/java/rwth/server/pathfinder/PathFinder.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pathfinder;
 
 import java.sql.Connection;
diff --git a/src/main/java/rwth/server/pojo/MapArea.java b/src/main/java/rwth/server/pojo/MapArea.java
index e2381397e39ad791d8f39af5d4ba994c181d6d52..ccfb90b0cf0e5d0acaab62dd26bd6f6e14b72bbe 100644
--- a/src/main/java/rwth/server/pojo/MapArea.java
+++ b/src/main/java/rwth/server/pojo/MapArea.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pojo;
 
 import com.smartfoxserver.v2.entities.data.ISFSObject;
diff --git a/src/main/java/rwth/server/pojo/MapSector.java b/src/main/java/rwth/server/pojo/MapSector.java
index f3754983c8eec966ec0a36f31f3185b4b5334ebb..a2a2b14f89f80f68af3108f217c53e5a06722425 100644
--- a/src/main/java/rwth/server/pojo/MapSector.java
+++ b/src/main/java/rwth/server/pojo/MapSector.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pojo;
 
 import java.util.HashMap;
diff --git a/src/main/java/rwth/server/pojo/ScenarioTrack.java b/src/main/java/rwth/server/pojo/ScenarioTrack.java
index fefce272298108c4222c80ea07580b4018602905..c60938b75f6cc49a297db2afe95508e3681209a1 100644
--- a/src/main/java/rwth/server/pojo/ScenarioTrack.java
+++ b/src/main/java/rwth/server/pojo/ScenarioTrack.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pojo;
 
 import java.util.List;
diff --git a/src/main/java/rwth/server/pojo/SimulationScenario.java b/src/main/java/rwth/server/pojo/SimulationScenario.java
index e3bd2fbf14fc9008866e470b0e93ef45cd8dfd9c..e8941cc7224ba01470f14a63019003aebd903964 100644
--- a/src/main/java/rwth/server/pojo/SimulationScenario.java
+++ b/src/main/java/rwth/server/pojo/SimulationScenario.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.pojo;
 
 import java.util.List;
diff --git a/src/main/java/rwth/server/simulation/Car.java b/src/main/java/rwth/server/simulation/Car.java
index e9dd4d46c8cb22dc5f7b0a445c81c73dd640f5c8..658d66a13044b5b2a1283ca815fa4753c89e4409 100644
--- a/src/main/java/rwth/server/simulation/Car.java
+++ b/src/main/java/rwth/server/simulation/Car.java
@@ -1,11 +1,16 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import org.apache.commons.math3.linear.RealMatrix;
 
 import com.smartfoxserver.v2.entities.data.SFSArray;
 import com.smartfoxserver.v2.entities.data.SFSObject;
-import javafx.geometry.Point3D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point3D;
 import rwth.server.bo.util.Logger;
 
 public class Car {
diff --git a/src/main/java/rwth/server/simulation/ConversionUtils.java b/src/main/java/rwth/server/simulation/ConversionUtils.java
index 50272abe536459bf26f33e49e041c104c246acb4..203a5c3c7c9e41f65bf0a9fcb148d69dff63da98 100644
--- a/src/main/java/rwth/server/simulation/ConversionUtils.java
+++ b/src/main/java/rwth/server/simulation/ConversionUtils.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import java.util.ArrayList;
@@ -7,7 +12,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Geometry;
-import javafx.geometry.Point3D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point3D;
 import simulation.environment.pedestrians.Pedestrian;
 import simulation.environment.object.Tree;
 import simulation.environment.visualisationadapter.interfaces.EnvNode;
diff --git a/src/main/java/rwth/server/simulation/FrameData.java b/src/main/java/rwth/server/simulation/FrameData.java
index 63e8ad1f8183692b15cd3ddf7ff47220806a9a77..cf716fedd22b983ec45d25f98f48ebee8cd97120 100644
--- a/src/main/java/rwth/server/simulation/FrameData.java
+++ b/src/main/java/rwth/server/simulation/FrameData.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import java.util.ArrayList;
@@ -7,7 +12,7 @@ import java.util.List;
 import com.smartfoxserver.v2.entities.data.SFSArray;
 import com.smartfoxserver.v2.entities.data.SFSObject;
 
-import javafx.geometry.Point3D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point3D;
 import simulation.environment.pedestrians.Pedestrian;
 import simulation.environment.pedestrians.PedestrianStreetParameters;
 
diff --git a/src/main/java/rwth/server/simulation/SimVehicle.java b/src/main/java/rwth/server/simulation/SimVehicle.java
index c9b2cc26e5bb4d42dbf77e733c8ad39b8fdea43a..33648d6fd7982038edb1c9a0b29a677825fd26b3 100644
--- a/src/main/java/rwth/server/simulation/SimVehicle.java
+++ b/src/main/java/rwth/server/simulation/SimVehicle.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import rwth.server.pojo.ScenarioTrack;
diff --git a/src/main/java/rwth/server/simulation/SimulationBuffer.java b/src/main/java/rwth/server/simulation/SimulationBuffer.java
index a291656b3d77816732c4fb9994546cc38f126952..de385bd4cb34c23fa99125bf6e8ab33c43388be5 100644
--- a/src/main/java/rwth/server/simulation/SimulationBuffer.java
+++ b/src/main/java/rwth/server/simulation/SimulationBuffer.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import java.util.Date;
diff --git a/src/main/java/rwth/server/simulation/SimulationController.java b/src/main/java/rwth/server/simulation/SimulationController.java
index e5136757bc0a3117fffb5a65d459bb8490201096..16921bf45e341e77cf94e0cb7e16c59d84df97ea 100644
--- a/src/main/java/rwth/server/simulation/SimulationController.java
+++ b/src/main/java/rwth/server/simulation/SimulationController.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;
@@ -8,8 +13,8 @@ import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.simulation.Simulati
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.library.databus.DataBus;
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.library.functionBlock.ConnectionEntry;
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.library.functionBlock.FunctionBlock;
-import javafx.geometry.Point3D;
-import mainControlBlock.MainControlBlock;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point3D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.control.mainControlBlock.MainControlBlock;
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.navigation.navigationBlock.NavigationBlock;
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.navigation.navigationBlock.components.FindPath;
 import rwth.server.bo.EnvObjectBO;
@@ -34,7 +39,7 @@ import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.library.structur
 import java.util.*;
 import java.util.function.Function;
 
-public class SimulationController implements SimulationLoopNotifiable {
+public class SimulationController extends SimulationLoopNotifiable {
 	
 	private Logger console;
 	private Simulator simulation;
@@ -412,7 +417,7 @@ public class SimulationController implements SimulationLoopNotifiable {
     	inputs.put(ConnectionEntry.FIND_PATH_target_vertex.toString(), getVertexForOsmId(graph, target.getOsmId()));
     	
     	findPath.setInputs(inputs);
-    	findPath.execute();
+    	findPath.execute(0);
     	
     	return (List<Vertex>) findPath.getOutputs().get(ConnectionEntry.FIND_PATH_path.toString());
     }
diff --git a/src/main/java/rwth/server/simulation/StaticBoxObject.java b/src/main/java/rwth/server/simulation/StaticBoxObject.java
index e6d51df1b62f0bdec32e5eef4a561c201b9a3b2a..dee63b27c1082b6379b80ec3b5dea242f52b24a7 100644
--- a/src/main/java/rwth/server/simulation/StaticBoxObject.java
+++ b/src/main/java/rwth/server/simulation/StaticBoxObject.java
@@ -1,9 +1,14 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.simulation.PhysicalObject;
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Geometry;
-import javafx.geometry.Point3D;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.utils.Point3D;
 import org.apache.commons.math3.linear.RealMatrix;
 
 import com.smartfoxserver.v2.entities.data.SFSObject;
diff --git a/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java b/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java
index ce000cc6e0e275b351ca0fdd128c6c875798f763..9154df0e99354557bf638d90764a2024d350069c 100644
--- a/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java
+++ b/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation.adapters.AutoPilot;
 
 import java.io.Serializable;
diff --git a/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java b/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java
index 063b206efd608d402ca846d5f2fbc1880b7ff00b..b1a7bd0c5c3a4ffb261011ed67ba51ba204d3dcb 100644
--- a/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java
+++ b/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation.adapters.interfaces;
 
 import java.rmi.Remote;
diff --git a/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java b/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java
index 045b5e3578216a17966ba04dd7140f12e464e037..e7e91ddca1d1ab71c44d75940dd8f07a06b4e64e 100644
--- a/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java
+++ b/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.simulation.adapters.util;
 
 import java.io.Serializable;
@@ -11,8 +16,8 @@ import java.util.HashMap;
 
 import com.smartfoxserver.v2.extensions.ExtensionLogLevel;
 
-import rwth.rmi.model.server.interfaces.RMIManager;
-import rwth.rmi.model.server.RMIServer;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.hardware_emulator.ModelServer;;
+import de.rwth.monticore.EmbeddedMontiArc.simulators.rmimodelserver.RMIServer;
 import rwth.server.bo.util.Logger;
 
 public class RMIClient {
@@ -21,7 +26,7 @@ public class RMIClient {
 	/**
 	 * RMIServer providing functionalities for specific model.
 	 */
-	private RMIManager manager;
+	private ModelServer manager;
 	private Integer modelId;
 	private Long vehicleId;
 	
@@ -38,7 +43,7 @@ public class RMIClient {
 
 		try {
 			Registry registry = LocateRegistry.getRegistry(host, port);
-			this.manager = (RMIManager) registry.lookup(RMIServer.MODEL_MANAGER);
+			this.manager = (ModelServer) registry.lookup(RMIServer.MODEL_MANAGER);
 			//register model to be created by the RMIManager
 			this.modelId = this.manager.alloc_autopilot(configuration);
 			if (this.modelId < 0){
diff --git a/src/main/java/rwth/server/upload/ScenarioUpload.java b/src/main/java/rwth/server/upload/ScenarioUpload.java
index 5e0ebfd90a90bdbcc72b9803c2ba92ac19639aa9..f531295b16412dbff5efc4f5bf8b0124db69779d 100644
--- a/src/main/java/rwth/server/upload/ScenarioUpload.java
+++ b/src/main/java/rwth/server/upload/ScenarioUpload.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.upload;
 
 import java.io.File;
@@ -235,7 +240,7 @@ public class ScenarioUpload {
         inputs.put(ConnectionEntry.LOCATE_NEAREST_VERTEX_IN_GRAPH_gps_coordinates.toString(), position);
 
         locateNearestVect.setInputs(inputs);
-        locateNearestVect.execute();
+        locateNearestVect.execute(0);
 
         Vertex vertex = (Vertex) locateNearestVect.getOutputs()
                 .get(ConnectionEntry.LOCATE_NEAREST_VERTEX_IN_GRAPH_nearest_vertex.toString());
diff --git a/src/main/java/rwth/server/zone/handlers/LoginHandler.java b/src/main/java/rwth/server/zone/handlers/LoginHandler.java
index 589e933239eca1c9331d2c9499cc7dbcde0356a5..57642a804581bd070a320f092131d954fc484288 100644
--- a/src/main/java/rwth/server/zone/handlers/LoginHandler.java
+++ b/src/main/java/rwth/server/zone/handlers/LoginHandler.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.zone.handlers;
 
 import com.smartfoxserver.bitswarm.sessions.ISession;
diff --git a/src/test/java/rwth/server/extensions/ZoneExtTest.java b/src/test/java/rwth/server/extensions/ZoneExtTest.java
index 567f69c750352482febade07fae149f087e3e8e6..fe51cc10fa97cbf6efbbcfd9efac4b8dd0eb92e6 100644
--- a/src/test/java/rwth/server/extensions/ZoneExtTest.java
+++ b/src/test/java/rwth/server/extensions/ZoneExtTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package rwth.server.extensions;
 
 import org.junit.Test;
diff --git a/src/test/java/rwth/server/upload/ScenarioUploadTest.java b/src/test/java/rwth/server/upload/ScenarioUploadTest.java
index cf33671bfa6f33f9925b64bf0a4e54f0ebd49d1b..f01911ac820f3c5c9ca78841c847334a4d493d86 100644
--- a/src/test/java/rwth/server/upload/ScenarioUploadTest.java
+++ b/src/test/java/rwth/server/upload/ScenarioUploadTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
  package rwth.server.upload;
 
 import com.smartfoxserver.v2.db.DBConfig;
diff --git a/src/test/java/server/PojoTest.java b/src/test/java/server/PojoTest.java
index 716212f39d371388cec7012aaefdc8ec6b796eb9..974759c9dfa45ba697e4e0ad70f38319643cd150 100644
--- a/src/test/java/server/PojoTest.java
+++ b/src/test/java/server/PojoTest.java
@@ -1,4 +1,9 @@
-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server;
 
 import java.util.Arrays;
diff --git a/src/test/resources/Aachen.sim b/src/test/resources/Aachen.sim
index 80e0249b2faeaf0c5bb23391061c07b30fcb6cec..a5b0b7c4c4615974397a26f7e29dbc3848e83fd5 100644
--- a/src/test/resources/Aachen.sim
+++ b/src/test/resources/Aachen.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 15s;
     
diff --git a/src/test/resources/Hamburg.sim b/src/test/resources/Hamburg.sim
index 16959cd606eb7181742ca9341a09a37f05c8ab08..95cd88a28186a72d34deee102e86dfd80c1b4dfe 100644
--- a/src/test/resources/Hamburg.sim
+++ b/src/test/resources/Hamburg.sim
@@ -1,4 +1,3 @@
-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 4h;