diff --git a/src/BaselineOfMuTalk/BaselineOfMuTalk.class.st b/src/BaselineOfMuTalk/BaselineOfMuTalk.class.st
index 318f9d5..b03d56c 100644
--- a/src/BaselineOfMuTalk/BaselineOfMuTalk.class.st
+++ b/src/BaselineOfMuTalk/BaselineOfMuTalk.class.st
@@ -12,22 +12,36 @@ BaselineOfMuTalk >> baseline: spec [
 	spec for: #common do: [
 		spec
 			package: 'TestCoverage';
-			package: 'MuTalk-Model' with: [ spec requires: #( 'TestCoverage' ) ];
-			package: 'MuTalk-TestResources' with: [ spec requires: #( 'MuTalk-Model' ) ];
-			package: 'MuTalk-TestResourcesForExtensionMethods' with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-TestResources' ) ];
+			package: 'MuTalk-Model'
+			with: [ spec requires: #( 'TestCoverage' ) ];
+			package: 'MuTalk-TestResources'
+			with: [ spec requires: #( 'MuTalk-Model' ) ];
+			package: 'MuTalk-TestResourcesForExtensionMethods'
+			with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-TestResources' ) ];
 			package: 'MuTalk-CI' with: [ spec requires: #( 'MuTalk-Model' ) ];
-			package: 'MuTalk-CI-Tests' with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-CI' ) ];
-			package: 'MuTalk-Tests' with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-TestResources' 'MuTalk-TestResourcesForExtensionMethods' ) ];
-			package: 'MuTalk-SpecUI' with: [ spec requires: #( 'MuTalk-Model' ) ];
-			package: 'MuTalk-Utilities' with: [ spec requires: #( 'MuTalk-Model' ) ];
-			package: 'MuTalk-Utilities-Tests' with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-Utilities' ) ];
-			package: 'MuTalk-Examples' with: [ spec requires: #( 'MuTalk-Model' ) ].
+			package: 'MuTalk-CI-Tests'
+			with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-CI' ) ];
+			package: 'MuTalk-Tests' with: [
+				spec requires:
+						#( 'MuTalk-Model' 'MuTalk-TestResources' 'MuTalk-TestResourcesForExtensionMethods' ) ];
+			package: 'MuTalk-SpecUI'
+			with: [ spec requires: #( 'MuTalk-Model' ) ];
+			package: 'MuTalk-Utilities'
+			with: [ spec requires: #( 'MuTalk-Model' ) ];
+			package: 'MuTalk-Utilities-Tests'
+			with: [ spec requires: #( 'MuTalk-Model' 'MuTalk-Utilities' ) ];
+			package: 'MuTalk-Examples'
+			with: [ spec requires: #( 'MuTalk-Model' ) ];
+			package: 'MuTalk-Examples-Tests'
+			with: [ spec requires: #( 'MuTalk-Examples' ) ].
 
 		spec
+			group: 'Examples'
+			with: #( 'MuTalk-Examples' 'MuTalk-Examples-Tests' );
 			group: 'default'
 			with: #( 'TestCoverage' 'MuTalk-Model' 'MuTalk-TestResources'
 				   'MuTalk-TestResourcesForExtensionMethods'
 				   'MuTalk-Tests' 'MuTalk-CI' 'MuTalk-CI-Tests' 'MuTalk-SpecUI'
 				   'MuTalk-Utilities' 'MuTalk-Utilities-Tests'
-				   'MuTalk-Examples' ) ]
+				   'Examples' ) ]
 ]
diff --git a/src/MuTalk-Examples/MyVehicleTest.class.st b/src/MuTalk-Examples-Tests/MyVehicleTest.class.st
similarity index 87%
rename from src/MuTalk-Examples/MyVehicleTest.class.st
rename to src/MuTalk-Examples-Tests/MyVehicleTest.class.st
index cfed1e4..e4c86f1 100644
--- a/src/MuTalk-Examples/MyVehicleTest.class.st
+++ b/src/MuTalk-Examples-Tests/MyVehicleTest.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : 'MyVehicleTest',
 	#superclass : 'TestCase',
-	#category : 'MuTalk-Examples',
-	#package : 'MuTalk-Examples'
+	#category : 'MuTalk-Examples-Tests',
+	#package : 'MuTalk-Examples-Tests'
 }
 
 { #category : 'tests' }
diff --git a/src/MuTalk-Examples-Tests/package.st b/src/MuTalk-Examples-Tests/package.st
new file mode 100644
index 0000000..27c0fa5
--- /dev/null
+++ b/src/MuTalk-Examples-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : 'MuTalk-Examples-Tests' }