diff --git a/gui/org.eclipse.efm.ui.intro/META-INF/MANIFEST.MF b/gui/org.eclipse.efm.ui.intro/META-INF/MANIFEST.MF
index 202abc7..684ccf1 100644
--- a/gui/org.eclipse.efm.ui.intro/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.efm.ui.intro/META-INF/MANIFEST.MF
@@ -7,6 +7,8 @@
 Bundle-Vendor: CEA LIST
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ui.intro
+ org.eclipse.ui.intro,
+ org.eclipse.ui.intro.quicklinks,
+ org.eclipse.efm.modeling.doc.helpcontents
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/css/overview.css b/gui/org.eclipse.efm.ui.intro/extensions/css/overview.css
index 71c8419..77ac236 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/css/overview.css
+++ b/gui/org.eclipse.efm.ui.intro/extensions/css/overview.css
@@ -1,11 +1,11 @@
 a#im-help-class-diagrams img,
 a#im-help-papyrus img,
 a#im-help-profiles img {
-	background-image : url(../../img/efm-48.png);
+	background-image : url(../../images/efm48.png);
 }
 
 a#im-help-class-diagrams:hover img,
 a#im-help-papyrus:hover img,
 a#im-help-profiles:hover img {
-	background-image : url(../../img/efm-48_hover.png);
+	background-image : url(../../images/efm48_hover.png);
 }
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/css/overview.properties b/gui/org.eclipse.efm.ui.intro/extensions/css/overview.properties
index 00398db..4436a3a 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/css/overview.properties
+++ b/gui/org.eclipse.efm.ui.intro/extensions/css/overview.properties
@@ -1,5 +1,5 @@
-overview.im-help-class-diagrams.link-icon = img/efm-48.png
-overview.im-help-class-diagrams.hover-icon = img/efm-48_hover.png
+overview.im-help-class-diagrams.link-icon = images/efm48.png
+overview.im-help-class-diagrams.hover-icon = images/efm48_hover.png
 
-overview.im-help-profiles.link-icon = img/efm-48.png
-overview.im-help-profiles.hover-icon = img/efm-48_hover.png
\ No newline at end of file
+overview.im-help-profiles.link-icon = images/efm48.png
+overview.im-help-profiles.hover-icon = images/efm48_hover.png
\ No newline at end of file
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/css/samples.css b/gui/org.eclipse.efm.ui.intro/extensions/css/samples.css
index 2809858..f7d79f2 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/css/samples.css
+++ b/gui/org.eclipse.efm.ui.intro/extensions/css/samples.css
@@ -1,9 +1,9 @@
 a#im-sample-project-management img {
-	background-image : url(../../img/efm-48.png);
+	background-image : url(../../images/efm48.png);
 }
 
 a#im-sample-project-management:hover img {
-	background-image : url(../../img/efm-48_hover.png);
+	background-image : url(../../images/efm48_hover.png);
 }
 
 .content-group {
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/css/samples.properties b/gui/org.eclipse.efm.ui.intro/extensions/css/samples.properties
index 5fa1a89..5e34bcd 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/css/samples.properties
+++ b/gui/org.eclipse.efm.ui.intro/extensions/css/samples.properties
@@ -1,2 +1,2 @@
-overview.im-sample-project-management.link-icon = img/efm-48.png
-overview.im-sample-project-management.hover-icon = img/efm-48_hover.png
+overview.im-sample-project-management.link-icon = images/efm48.png
+overview.im-sample-project-management.hover-icon = images/efm48_hover.png
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.css b/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.css
index 1fb46b3..195545d 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.css
+++ b/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.css
@@ -1,9 +1,9 @@
 a#im-tutorial-getting-started img {
-	background-image : url(../../img/efm-48.png);
+	background-image : url(../../images/efm48.png);
 }
 
 a#im-tutorial-getting-started:hover img {
-	background-image : url(../../img/efm-48_hover.png);
+	background-image : url(../../images/efm48_hover.png);
 }
 
 .content-group {
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.properties b/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.properties
index b4502f5..954983f 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.properties
+++ b/gui/org.eclipse.efm.ui.intro/extensions/css/tutorials.properties
@@ -1,2 +1,2 @@
-tutorials.im-tutorial-getting-started.link-icon = img/efm-48.png
-tutorials.im-tutorial-getting-started.hover-icon = img/efm-48_hover.png
+tutorials.im-tutorial-getting-started.link-icon = images/efm48.png
+tutorials.im-tutorial-getting-started.hover-icon = images/efm48_hover.png
diff --git a/gui/org.eclipse.efm.ui.intro/extensions/tutorialsExtensionContent.xml b/gui/org.eclipse.efm.ui.intro/extensions/tutorialsExtensionContent.xml
index 93e6b69..756e77b 100644
--- a/gui/org.eclipse.efm.ui.intro/extensions/tutorialsExtensionContent.xml
+++ b/gui/org.eclipse.efm.ui.intro/extensions/tutorialsExtensionContent.xml
@@ -5,7 +5,7 @@
       <link label="Getting Started with Model-based testing with Thermostat example" 
       		id="im-tutorial-getting-started" 
       		style-id="content-link"
-      		url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.efm.tutorial.Thermostat.cheatsheet" >
+      		url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.efm.tutorial.thermostat.cheatsheet" >
         <text>This tutorial provides an introduction into the symbolic modeling framework and offline testing process.</text>
       </link>
     </group>
diff --git a/gui/org.eclipse.efm.ui.intro/img/efm-48.png b/gui/org.eclipse.efm.ui.intro/images/efm48.png
similarity index 100%
rename from gui/org.eclipse.efm.ui.intro/img/efm-48.png
rename to gui/org.eclipse.efm.ui.intro/images/efm48.png
Binary files differ
diff --git a/gui/org.eclipse.efm.ui.intro/img/efm-48_hover.png b/gui/org.eclipse.efm.ui.intro/images/efm48_hover.png
similarity index 100%
rename from gui/org.eclipse.efm.ui.intro/img/efm-48_hover.png
rename to gui/org.eclipse.efm.ui.intro/images/efm48_hover.png
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.feature/feature.xml b/releng/org.eclipse.efm.modeling.feature/feature.xml
index 5945c67..63f7586 100644
--- a/releng/org.eclipse.efm.modeling.feature/feature.xml
+++ b/releng/org.eclipse.efm.modeling.feature/feature.xml
@@ -278,4 +278,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.efm.ui.intro"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.efm.tutorial.thermostat"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-1-48.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-1-48.png
deleted file mode 100644
index a3d4802..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-1-48.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-128.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-128.png
deleted file mode 100644
index 65ec325..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-128.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-16.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-16.png
deleted file mode 100644
index e2f1b18..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-16.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-256.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-256.png
deleted file mode 100644
index bb5030b..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-256.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-256.svg b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-256.svg
deleted file mode 100644
index 9d6c4d5..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-256.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="256"
-   height="256"
-   viewBox="0 0 256 256"
-   sodipodi:docname="efm-256.svg"
-   inkscape:export-filename="C:\efm\git\org.eclipse.efm-modeling\releng\org.eclipse.efm.modeling.rcp\icons\efm-128.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       x1="0"
-       y1="0"
-       x2="1"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(118.74277,0,0,118.74277,71.91069,183.38517)"
-       spreadMethod="pad"
-       id="linearGradient38">
-      <stop
-         style="stop-opacity:1;stop-color:#80cc29"
-         offset="0"
-         id="stop40" />
-      <stop
-         style="stop-opacity:1;stop-color:#ffffff"
-         offset="1"
-         id="stop42" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1125"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="3.1871758"
-     inkscape:cx="74.116272"
-     inkscape:cy="124.18927"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="m 72.16296,97.05428 c 0,0 -41.1457,63.61207 31.55357,94.66094 l 17.16572,-3.78648 c 0,0 -77.74836,-17.41756 -48.71929,-90.87446"
-     style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path28"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 131.28198,183.38517 c -32.7897,0 -59.37129,-26.58154 -59.37129,-59.37153 0,-32.78961 26.58159,-59.370926 59.37129,-59.370926 32.78999,0 59.37152,26.581316 59.37152,59.370926 0,32.78999 -26.58153,59.37153 -59.37152,59.37153"
-     style="fill:url(#linearGradient38);fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path44"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 130.77777,147.13683 c 11.87796,0 21.50721,-9.62929 21.50721,-21.50733 0,-11.87799 -9.62925,-21.50726 -21.50721,-21.50726 -11.8782,0 -21.50748,9.62927 -21.50748,21.50726 0,11.87804 9.62928,21.50733 21.50748,21.50733"
-     style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path54"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 27.84543,126.23273 c 0,0 77.48484,-109.617456 228.44858,-49.229796 0,0 -120.14502,-33.17866 -228.44858,49.229796"
-     style="fill:#3fa1c1;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path56"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 0.29400557,194.64446 c 0,0 127.10010443,32.44068 210.64782443,-43.68052 0,0 -61.9598,45.36009 -210.64782443,43.68052"
-     style="fill:#3fa1c1;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path58"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="20.508163"
-     inkscape:export-ydpi="20.508163" />
-  <path
-     d="m 135.02972,131.82483 c 4.94685,0 8.95698,-4.00979 8.95698,-8.9571 0,-4.94647 -4.01013,-8.95708 -8.95698,-8.95708 -4.94696,0 -8.95714,4.01061 -8.95714,8.95708 0,4.94731 4.01018,8.9571 8.95714,8.9571"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     id="path80"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-32.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-32.png
deleted file mode 100644
index 76e2ac3..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-32.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-48.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-48.png
deleted file mode 100644
index cbd8020..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-48.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-64.png b/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-64.png
deleted file mode 100644
index b8ad40b..0000000
--- a/releng/org.eclipse.efm.modeling.rcp/icons-efm/efm-64.png
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.efm.modeling.textual.feature/feature.xml b/releng/org.eclipse.efm.modeling.textual.feature/feature.xml
index a46aeb3..14f265c 100644
--- a/releng/org.eclipse.efm.modeling.textual.feature/feature.xml
+++ b/releng/org.eclipse.efm.modeling.textual.feature/feature.xml
@@ -159,4 +159,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.efm.ui.intro"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.efm.tutorial.thermostat"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/.classpath b/tutorial/org.eclipse.efm.tutorial.thermostat/.classpath
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/.classpath
rename to tutorial/org.eclipse.efm.tutorial.thermostat/.classpath
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/.gitignore b/tutorial/org.eclipse.efm.tutorial.thermostat/.gitignore
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/.gitignore
rename to tutorial/org.eclipse.efm.tutorial.thermostat/.gitignore
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/.project b/tutorial/org.eclipse.efm.tutorial.thermostat/.project
similarity index 92%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/.project
rename to tutorial/org.eclipse.efm.tutorial.thermostat/.project
index 51735fd..42850b1 100644
--- a/tutorial/org.eclipse.efm.tutorial.Thermostat/.project
+++ b/tutorial/org.eclipse.efm.tutorial.thermostat/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.efm.tutorial.Thermostat</name>
+	<name>org.eclipse.efm.tutorial.thermostat</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/.settings/org.eclipse.jdt.core.prefs b/tutorial/org.eclipse.efm.tutorial.thermostat/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/.settings/org.eclipse.jdt.core.prefs
rename to tutorial/org.eclipse.efm.tutorial.thermostat/.settings/org.eclipse.jdt.core.prefs
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/META-INF/MANIFEST.MF b/tutorial/org.eclipse.efm.tutorial.thermostat/META-INF/MANIFEST.MF
similarity index 86%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/META-INF/MANIFEST.MF
rename to tutorial/org.eclipse.efm.tutorial.thermostat/META-INF/MANIFEST.MF
index 92a5a55..68bec75 100644
--- a/tutorial/org.eclipse.efm.tutorial.Thermostat/META-INF/MANIFEST.MF
+++ b/tutorial/org.eclipse.efm.tutorial.thermostat/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Thermostat Tutorial
-Bundle-SymbolicName: org.eclipse.efm.tutorial.Thermostat;singleton:=true
+Bundle-SymbolicName: org.eclipse.efm.tutorial.thermostat;singleton:=true
 Bundle-Version: 0.0.1.qualifier
 Bundle-Activator: org.eclipse.efm.tutorial.thermostat.Activator
 Bundle-Vendor: CEA LIST
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/about.html b/tutorial/org.eclipse.efm.tutorial.thermostat/about.html
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/about.html
rename to tutorial/org.eclipse.efm.tutorial.thermostat/about.html
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/build.properties b/tutorial/org.eclipse.efm.tutorial.thermostat/build.properties
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/build.properties
rename to tutorial/org.eclipse.efm.tutorial.thermostat/build.properties
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/cheatsheet/getting_started-orig.xml b/tutorial/org.eclipse.efm.tutorial.thermostat/cheatsheet/getting_started-orig.xml
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/cheatsheet/getting_started-orig.xml
rename to tutorial/org.eclipse.efm.tutorial.thermostat/cheatsheet/getting_started-orig.xml
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/cheatsheet/getting_started.xml b/tutorial/org.eclipse.efm.tutorial.thermostat/cheatsheet/getting_started.xml
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/cheatsheet/getting_started.xml
rename to tutorial/org.eclipse.efm.tutorial.thermostat/cheatsheet/getting_started.xml
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/license.html b/tutorial/org.eclipse.efm.tutorial.thermostat/license.html
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/license.html
rename to tutorial/org.eclipse.efm.tutorial.thermostat/license.html
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/outputTrace/mergeTrace.txt b/tutorial/org.eclipse.efm.tutorial.thermostat/outputTrace/mergeTrace.txt
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/outputTrace/mergeTrace.txt
rename to tutorial/org.eclipse.efm.tutorial.thermostat/outputTrace/mergeTrace.txt
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/plugin.xml b/tutorial/org.eclipse.efm.tutorial.thermostat/plugin.xml
similarity index 60%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/plugin.xml
rename to tutorial/org.eclipse.efm.tutorial.thermostat/plugin.xml
index 067de9e..1d426a1 100644
--- a/tutorial/org.eclipse.efm.tutorial.Thermostat/plugin.xml
+++ b/tutorial/org.eclipse.efm.tutorial.thermostat/plugin.xml
@@ -4,15 +4,15 @@
    <extension
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
       <category
-            id="org.eclipse.efm.tutorial.Thermostat.category"
+            id="org.eclipse.efm.tutorial.thermostat.category"
             name="ThermostTutorial">
       </category>
       <cheatsheet
-            category="org.eclipse.efm.tutorial.Thermostat.category"
+            category="org.eclipse.efm.tutorial.thermostat.category"
             composite="false"
             contentFile="cheatsheet/getting_started.xml"
-            id="org.eclipse.efm.tutorial.Thermostat.cheatsheet"
-            name="org.eclipse.efm.tutorial.Thermostat.cheatsheet">
+            id="org.eclipse.efm.tutorial.thermostat.cheatsheet"
+            name="org.eclipse.efm.tutorial.thermostat.cheatsheet">
       </cheatsheet>
    </extension>
 
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/pom.xml b/tutorial/org.eclipse.efm.tutorial.thermostat/pom.xml
similarity index 83%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/pom.xml
rename to tutorial/org.eclipse.efm.tutorial.thermostat/pom.xml
index b1d9c52..f143874 100644
--- a/tutorial/org.eclipse.efm.tutorial.Thermostat/pom.xml
+++ b/tutorial/org.eclipse.efm.tutorial.thermostat/pom.xml
@@ -7,8 +7,8 @@
 		<artifactId>org.eclipse.efm.modeling.tutorial</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.efm.tutorial.Thermostat</artifactId>
+	<artifactId>org.eclipse.efm.tutorial.thermostat</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<name>org.eclipse.efm.tutorial.Thermostat</name>
+	<name>org.eclipse.efm.tutorial.thermostat</name>
 	<description>This plug-in contains Thermostat tutorial...</description>
 </project>
\ No newline at end of file
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/Activator.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/Activator.java
similarity index 97%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/Activator.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/Activator.java
index 4d22aef..3ff4683 100644
--- a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/Activator.java
+++ b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/Activator.java
@@ -22,7 +22,7 @@
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.efm.tutorial.Thermostat"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.efm.tutorial.thermostat"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Channel.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Channel.java
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Channel.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Channel.java
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Equipement.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Equipement.java
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Equipement.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Equipement.java
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Sensor.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Sensor.java
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Sensor.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Sensor.java
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Thermostat.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Thermostat.java
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Thermostat.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/Thermostat.java
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/ThermostatSystem.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/ThermostatSystem.java
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/system/ThermostatSystem.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/system/ThermostatSystem.java
diff --git a/tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/utils/Couple.java b/tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/utils/Couple.java
similarity index 100%
rename from tutorial/org.eclipse.efm.tutorial.Thermostat/src/org/eclipse/efm/tutorial/thermostat/utils/Couple.java
rename to tutorial/org.eclipse.efm.tutorial.thermostat/src/org/eclipse/efm/tutorial/thermostat/utils/Couple.java
diff --git a/tutorial/pom.xml b/tutorial/pom.xml
index a19bce6..ed86711 100644
--- a/tutorial/pom.xml
+++ b/tutorial/pom.xml
@@ -13,6 +13,6 @@
 	<description>This module contains the different plugins relative to EFM tutorials</description>
 
 	<modules>
-		<module>org.eclipse.efm.tutorial.Thermostat</module>
+		<module>org.eclipse.efm.tutorial.thermostat</module>
 	</modules>
 </project>