diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..1e3a2157174318207268c979824c8f36180c3532
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+.metadata
+*.pyc
+*.bak
+*.bak-mo
+.project
+.pydevproject
+
+# pip install #
+#####################
+*.egg-info/
+*.egg/
+*.eggs
+dist
+*.pypirc
+build
+
+# PyCharm #
+#####################
+.idea
+.cache
+venv
+
+# Jupyter Notebook #
+#####################
+.ipynb_checkpoints
+
+# Unittest #
+#####################
+.pytest_cache
+htmlcov
+.coverage
+.unitTests-dymola.log
+
+installed_dependencies/*
+startup.mos
+working_dir
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 32bec109e5e56a806a962796072f4866a5495392..1d262692d2267e6cafc666ec8f956a0d334a2e2f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,7 @@
 	url = https://github.com/RWTH-EBC/TEASER
 [submodule "BuildingSim/BESMod"]
 	path = BuildingSim/BESMod
-	url = https://github.com/RWTH-EBC/BESMod.git
\ No newline at end of file
+	url = https://github.com/RWTH-EBC/BESMod.git
+[submodule "BuildingSim/FrostingModels"]
+	path = BuildingSim/FrostingModels
+	url = https://git-ce.rwth-aachen.de/ebc/projects/ebc0932_bmwk_elosdeutschland_kap/frostingmodelicamodels
diff --git a/BuildingSim/.idea/workspace.xml b/BuildingSim/.idea/workspace.xml
index dd363d2c51ae22cbe7edebda996a527f5efb7643..4c1bb9704056afc62ac9e1f883bebd49ec0b68f9 100644
--- a/BuildingSim/.idea/workspace.xml
+++ b/BuildingSim/.idea/workspace.xml
@@ -5,10 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="2bc32c04-dd44-4e01-9ff9-c09263eca269" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/working_dir/simulate.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/working_dir/simulate_with_dymola_api.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/working_dir/test_ebcpy.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/BESMod/installed_dependencies/IBPSA/.github/workflows/formatting.yml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/BESMod/installed_dependencies/IBPSA/.gitignore" beforeDir="false" />
@@ -5444,11 +5440,6 @@
       <change beforePath="$PROJECT_DIR$/BESMod/installed_dependencies/IBPSA/bin/convertBuildingsToAnnex60.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/BESMod/installed_dependencies/IBPSA/bin/runUnitTests.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/BESMod/installed_dependencies/IBPSA/bin/verifyFiles.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/working_dir/Modelica_RollOut/RollOut.mo" beforeDir="false" afterPath="$PROJECT_DIR$/working_dir/Modelica_RollOut/RollOut.mo" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dsin.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dslog.txt" beforeDir="false" afterPath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dslog.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dsmodel.c" beforeDir="false" afterPath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dsmodel.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dymosim.exe" beforeDir="false" afterPath="$PROJECT_DIR$/working_dir/Modelica_RollOut/dymosim.exe" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -5587,7 +5578,7 @@
       <option name="presentableId" value="Default" />
       <updated>1742207574701</updated>
       <workItem from="1742207576975" duration="4000" />
-      <workItem from="1743083402015" duration="22154000" />
+      <workItem from="1743083402015" duration="23379000" />
     </task>
     <servers />
   </component>
@@ -5637,6 +5628,11 @@
           <line>97</line>
           <option name="timeStamp" value="46" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/working_dir/simulate_with_dymola_api.py</url>
+          <line>123</line>
+          <option name="timeStamp" value="47" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/BuildingSim/FrostingModels b/BuildingSim/FrostingModels
new file mode 160000
index 0000000000000000000000000000000000000000..232a48571e1a1d366338fc3b4b9034d449bcb96b
--- /dev/null
+++ b/BuildingSim/FrostingModels
@@ -0,0 +1 @@
+Subproject commit 232a48571e1a1d366338fc3b4b9034d449bcb96b