diff --git a/bundles/tools.vitruv.applications.smarthomeuml/.classpath b/bundles/tools.vitruv.applications.smarthomeuml/.classpath
index 435940f20..946fb3d34 100644
--- a/bundles/tools.vitruv.applications.smarthomeuml/.classpath
+++ b/bundles/tools.vitruv.applications.smarthomeuml/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/tools.vitruv.applications.smarthomeuml/.maven_enable_dsls-compiler b/bundles/tools.vitruv.applications.smarthomeuml/.maven_enable_dsls-compiler
new file mode 100644
index 000000000..e69de29bb
diff --git a/bundles/tools.vitruv.applications.smarthomeuml/.project b/bundles/tools.vitruv.applications.smarthomeuml/.project
index da8d65b02..c42ee3cad 100644
--- a/bundles/tools.vitruv.applications.smarthomeuml/.project
+++ b/bundles/tools.vitruv.applications.smarthomeuml/.project
@@ -25,10 +25,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1720168160022</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/bundles/tools.vitruv.applications.smarthomeuml/META-INF/MANIFEST.MF b/bundles/tools.vitruv.applications.smarthomeuml/META-INF/MANIFEST.MF
index 9d6ce74ca..9636d2307 100644
--- a/bundles/tools.vitruv.applications.smarthomeuml/META-INF/MANIFEST.MF
+++ b/bundles/tools.vitruv.applications.smarthomeuml/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Smarthomeuml
-Bundle-SymbolicName: tools.vitruv.applications.smarthomeuml
-Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: tools.vitruv.applications.smarthomeuml;singleton:=true
+Bundle-Version: 3.0.1.qualifier
+Bundle-Vendor: vitruv.tools
 Export-Package: tools.vitruv.applications.smarthomeuml
 Automatic-Module-Name: tools.vitruv.applications.smarthomeuml
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/bundles/tools.vitruv.applications.smarthomeuml/build.properties b/bundles/tools.vitruv.applications.smarthomeuml/build.properties
index 34d2e4d2d..547fc3655 100644
--- a/bundles/tools.vitruv.applications.smarthomeuml/build.properties
+++ b/bundles/tools.vitruv.applications.smarthomeuml/build.properties
@@ -1,4 +1,7 @@
-source.. = src/
-output.. = bin/
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+output.. = target/classes/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.xml
diff --git a/bundles/tools.vitruv.applications.smarthomeuml/plugin.xml b/bundles/tools.vitruv.applications.smarthomeuml/plugin.xml
new file mode 100644
index 000000000..8608e29a8
--- /dev/null
+++ b/bundles/tools.vitruv.applications.smarthomeuml/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+   <extension
+         id="SmartHomeUMLApplication"
+         name="SmartHome-UML Application"
+         point="tools.vitruv.framework.applications.application">
+      <application
+            class="tools.vitruv.applications.smarthomeuml.SmartHomeUMLApplication"></application>
+   </extension>
+
+</plugin>
diff --git a/features/tools.vitruv.applications.smarthomeuml.feature/.project b/features/tools.vitruv.applications.smarthomeuml.feature/.project
new file mode 100644
index 000000000..e8b195cb6
--- /dev/null
+++ b/features/tools.vitruv.applications.smarthomeuml.feature/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>tools.vitruv.applications.smarthomeuml.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1720168160024</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/features/tools.vitruv.applications.smarthomeuml.feature/.settings/org.eclipse.core.resources.prefs b/features/tools.vitruv.applications.smarthomeuml.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..99f26c020
--- /dev/null
+++ b/features/tools.vitruv.applications.smarthomeuml.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/tools.vitruv.applications.smarthomeuml.feature/.settings/org.eclipse.m2e.core.prefs b/features/tools.vitruv.applications.smarthomeuml.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/features/tools.vitruv.applications.smarthomeuml.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/features/tools.vitruv.applications.smarthomeuml.feature/build.properties b/features/tools.vitruv.applications.smarthomeuml.feature/build.properties
new file mode 100644
index 000000000..b3a611b5c
--- /dev/null
+++ b/features/tools.vitruv.applications.smarthomeuml.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/tools.vitruv.applications.smarthomeuml.feature/feature.properties b/features/tools.vitruv.applications.smarthomeuml.feature/feature.properties
new file mode 100644
index 000000000..03a1d700d
--- /dev/null
+++ b/features/tools.vitruv.applications.smarthomeuml.feature/feature.properties
@@ -0,0 +1,7 @@
+featureName=Vitruv SmartHome-UML Application
+description=A Vitruv application for SmartHome and UML models
+providerName=vitruv.tools
+copyrightURL=http://vitruv.tools
+copyright=\
+Copyright (c) 2014-2022 Vitruv Tools Team\n\
+Karlsruhe Institute of Technology (KIT), Karlsruhe, Germany
\ No newline at end of file
diff --git a/features/tools.vitruv.applications.smarthomeuml.feature/feature.xml b/features/tools.vitruv.applications.smarthomeuml.feature/feature.xml
new file mode 100644
index 000000000..9d4512202
--- /dev/null
+++ b/features/tools.vitruv.applications.smarthomeuml.feature/feature.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="tools.vitruv.applications.smarthomeuml.feature"
+      label="%featureName"
+      version="3.0.1.qualifier"
+      provider-name="%providerName"
+      license-feature="tools.vitruv.license.feature"
+      license-feature-version="1.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="edu.kit.ipd.sdq.activextendannotations"/>
+      <import plugin="tools.vitruv.framework.applications"/>
+      <import plugin="tools.vitruv.dsls.reactions.runtime"/>
+      <import plugin="tools.vitruv.applications.util.temporary"/>
+      <import feature="tools.vitruv.applications.util.temporary.feature"/>
+      <import plugin="org.eclipse.uml2.uml"/>
+      <import plugin="org.emftext.language.java"/>
+      <import plugin="edu.kit.ipd.sdq.commons.util.emf"/>
+      <import plugin="edu.kit.ipd.sdq.commons.util.java"/>
+      <import plugin="edu.kit.ipd.sdq.metamodels.smarthome"/>
+   </requires>
+
+   <plugin
+         id="tools.vitruv.applications.smarthomeuml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/releng/tools.vitruv.casestudies.dependencywrapper/META-INF/MANIFEST.MF b/releng/tools.vitruv.casestudies.dependencywrapper/META-INF/MANIFEST.MF
index 20df567e6..16e4fb373 100644
--- a/releng/tools.vitruv.casestudies.dependencywrapper/META-INF/MANIFEST.MF
+++ b/releng/tools.vitruv.casestudies.dependencywrapper/META-INF/MANIFEST.MF
@@ -24,5 +24,6 @@ Require-Bundle: tools.vitruv.dsls.reactions,
  tools.vitruv.dsls.demo.insurancepersons,
  edu.kit.ipd.sdq.metamodels.autosar,
  edu.kit.ipd.sdq.metamodels.simulink,
+ edu.kit.ipd.sdq.metamodels.smarthome,
  tools.vitruv.dsls.demo.insurancepersons.tests
 Bundle-Vendor: tools.vitruv
diff --git a/releng/tools.vitruv.casestudies.parent/pom.xml b/releng/tools.vitruv.casestudies.parent/pom.xml
index bfe13d74b..796fa34b3 100644
--- a/releng/tools.vitruv.casestudies.parent/pom.xml
+++ b/releng/tools.vitruv.casestudies.parent/pom.xml
@@ -17,6 +17,7 @@
 		<vitruv.change.url>https://vitruv-tools.github.io/updatesite/nightly/change</vitruv.change.url>
 		<vitruv.framework.url>https://vitruv-tools.github.io/updatesite/nightly/framework</vitruv.framework.url>
 		<vitruv.dsls.url>https://vitruv-tools.github.io/updatesite/nightly/dsls</vitruv.dsls.url>
+		<kit-sdq.demometamodels.url>https://kit-sdq.github.io/updatesite/release/metamodels/demo/${sdq.demometamodels.version}</kit-sdq.demometamodels.url>
 	</properties>
 
 	<repositories>
@@ -39,7 +40,7 @@
 		<repository>
 			<id>Demo Metamodels</id>
 			<layout>p2</layout>
-			<url>https://kit-sdq.github.io/updatesite/release/metamodels/demo/${sdq.demometamodels.version}</url>
+			<url>${kit-sdq.demometamodels.url}</url>
 		</repository>
 		<repository>
 			<id>SDQ Commons</id>
@@ -123,6 +124,18 @@
 			</properties>
 		</profile>
 
+		<profile>
+			<id>local-demometamodels</id>
+			<activation>
+				<property>
+					<name>kit-sdq.demometamodels.path</name>
+				</property>
+			</activation>
+			<properties>
+				<kit-sdq.demometamodels.url>file:///${kit-sdq.demometamodels.path}/releng/edu.kit.ipd.sdq.metamodels.demo.updatesite/target/repository</kit-sdq.demometamodels.url>
+			</properties>
+		</profile>
+
 		<profile>
 			<id>compile-dsls</id>
 			<activation>
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/.classpath b/tests/tools.vitruv.applications.smarthomeuml.tests/.classpath
new file mode 100644
index 000000000..2d8e2a152
--- /dev/null
+++ b/tests/tools.vitruv.applications.smarthomeuml.tests/.classpath
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/slf4j-api-2.0.13.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/.project b/tests/tools.vitruv.applications.smarthomeuml.tests/.project
new file mode 100644
index 000000000..6c29aa9b3
--- /dev/null
+++ b/tests/tools.vitruv.applications.smarthomeuml.tests/.project
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>tools.vitruv.applications.smarthomeuml.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1720168160025</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..99f26c020
--- /dev/null
+++ b/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/tools.vitruv.applications.smarthomeuml/.settings/org.eclipse.jdt.core.prefs b/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/tools.vitruv.applications.smarthomeuml/.settings/org.eclipse.jdt.core.prefs
rename to tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.m2e.core.prefs b/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/tests/tools.vitruv.applications.smarthomeuml.tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.applications.smarthomeuml.tests/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..be31ceb1e
--- /dev/null
+++ b/tests/tools.vitruv.applications.smarthomeuml.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: tools.vitruv.applications.smarthomeuml.tests
+Bundle-Version: 1.0.0.qualifier
+Automatic-Module-Name: tools.vitruv.applications.smarthomeuml.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Require-Bundle: tools.vitruv.testutils.vsum,
+ tools.vitruv.applications.util.temporary,
+ tools.vitruv.applications.smarthomeuml,
+ org.junit,
+ junit-jupiter-api,
+ ch.qos.logback.core,
+ org.slf4j.api,
+ ch.qos.logback.classic,
+ edu.kit.ipd.sdq.commons.util.emf,
+ edu.kit.ipd.sdq.commons.util.java,
+ org.eclipse.emf.edit
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/build.properties b/tests/tools.vitruv.applications.smarthomeuml.tests/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/tests/tools.vitruv.applications.smarthomeuml.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/tests/tools.vitruv.applications.smarthomeuml.tests/lib/slf4j-api-2.0.13.jar b/tests/tools.vitruv.applications.smarthomeuml.tests/lib/slf4j-api-2.0.13.jar
new file mode 100644
index 000000000..a800cc2b5
Binary files /dev/null and b/tests/tools.vitruv.applications.smarthomeuml.tests/lib/slf4j-api-2.0.13.jar differ