diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
index bd1537e0..737970d7 100644
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
@@ -1,226 +1,8 @@
 baseline
 baseline: spec
-  <baseline>
-  spec
-    for: #'common'
-    do: [ 
-      spec blessing: #'baseline'.
-      spec
-        package: 'Grease-Core';
-        package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
-      spec
-        group: 'Core' with: #('Grease-Core');
-        group: 'Core Tests' with: #('Grease-Tests-Core');
-        group: 'Slime' with: #('Core');
-        group: 'Slime Tests' with: #('Core Tests');
-        group: 'Tests' with: #('Core Tests' 'Slime Tests');
-        group: 'default' with: #('Slime') ].
-  spec
-    for: #( #'squeak5.x' )
-    do: [ 
-      spec
-        project: 'Refactoring-Core'
-        with: [ 
-          spec
-            className: 'ConfigurationOfRefactoringBrowser';
-            versionString: #'stable';
-            loads: #('Core');
-            repository: 'http://www.squeaksource.com/MetacelloRepository' ].
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Squeak5-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ 
-              spec
-                requires: #('Grease-Squeak5-Core');
-                includes:
-                    #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
-        package: 'Grease-Squeak5-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Squeak-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ];
-        package: 'Grease-Tests-Squeak5-Core'
-          with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
-        package: 'Grease-Slime'
-          with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
-        package: 'Grease-Tests-Slime'
-          with: [ spec requires: #('Grease-Slime') ].
-      spec
-        group: 'Slime' with: #('Grease-Slime');
-        group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
-  spec
-    for: #( #'squeak6.x' )
-    do: [ 
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Squeak6-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ spec requires: #('Grease-Squeak6-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
-        package: 'Grease-Squeak6-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Squeak-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ];
-        package: 'Grease-Tests-Squeak6-Core'
-          with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
-      self  slimeForSqueakPharo1xPharo2x: spec ].
+	<baseline>
 
-  spec
-    for: #(#'pharo4.x' #'pharo5.x')
-    do: [ 
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Pharo30-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ 
-              spec
-                requires: #('Grease-Pharo30-Core');
-                includes: #('Grease-Tests-Pharo-Core') ];
-        package: 'Grease-Pharo30-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Pharo-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ];
-        package: 'Grease-Pharo40-Slime'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Slime'
-          with: [ spec requires: #('Grease-Pharo40-Slime') ].
-      spec
-        group: 'Slime' with: #('Grease-Pharo40-Slime');
-        group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
-  spec
-    for: #'pharo6.x'
-    do: [ 
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Pharo60-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ 
-              spec
-                requires: #('Grease-Pharo60-Core');
-                includes: #('Grease-Tests-Pharo-Core') ];
-        package: 'Grease-Pharo60-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Pharo-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ];
-        package: 'Grease-Pharo40-Slime'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Slime'
-          with: [ spec requires: #('Grease-Pharo40-Slime') ].
-      spec
-        group: 'Slime' with: #('Grease-Pharo40-Slime');
-        group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
-
-  spec
-    for: #(#'pharo7.x')
-    do: [ 
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Pharo70-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ spec requires: #('Grease-Pharo70-Core'); includes: #('Grease-Tests-Pharo-Core') ];
-        package: 'Grease-Pharo70-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Pharo-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ];
-        package: 'Grease-Pharo40-Slime'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Slime'
-          with: [ spec requires: #('Grease-Pharo40-Slime') ].
-      spec
-        group: 'Slime' with: #('Grease-Pharo40-Slime');
-        group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
-
-  spec
-    for: #'gemstone'
-    do: [ 
-      spec
-        project: 'GsCore'
-          with: [ 
-              spec
-                className: 'ConfigurationOfGsCore';
-                versionString: #'stable';
-                repository:
-                    'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
-        project: 'UTF8'
-          with: [ 
-              spec
-                className: 'ConfigurationOfGsMisc';
-                versionString: #'stable';
-                loads: #('Utf8Encoding');
-                repository:
-                    'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
-        project: 'System-Digital-Signatures'
-          copyFrom: 'UTF8'
-          with: [ spec loads: #('System-Digital-Signatures') ];
-        project: 'SMTPMail'
-          copyFrom: 'UTF8'
-          with: [ spec loads: #('SMTPMail') ].
-      spec
-        package: 'Grease-Core'
-          with: [ 
-              spec
-                requires: #('GsCore');
-                includes: #('Grease-GemStone-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ 
-              spec
-                requires: #('Grease-GemStone-Core');
-                includes: #('Grease-Tests-GemStone-Core') ];
-        package: 'Grease-GemStone-Core'
-          with: [ 
-              spec
-                requires:
-                  #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
-        package: 'Grease-Tests-GemStone-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ] ].
-  spec
-    for: #'gs2.x'
-    do: [ 
-      spec
-        package: 'Grease-GemStone-Core'
-          with: [ spec includes: #('Grease-GemStone200-Core') ];
-        package: 'Grease-GemStone200-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #'gs2.3.x'
-    do: [ 
-      spec
-        package: 'Grease-GemStone-Core'
-          with: [ spec includes: #('Grease-GemStone230-Core') ];
-        package: 'Grease-GemStone230-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #'gs2.4.x'
-    do: [ 
-      spec
-        package: 'Grease-GemStone-Core'
-          with: [ spec includes: #('Grease-GemStone240-Core') ];
-        package: 'Grease-GemStone240-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
-    do: [ 
-      spec
-        package: 'Grease-GemStone-Core'
-          with: [ spec includes: #('Grease-GemStone300-Core') ];
-        package: 'Grease-GemStone300-Core'
-          with: [ 
-              spec
-                requires: #('Grease-GemStone-Core');
-                postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
-  spec
-    for: #(#'gs3.3.x' #'gs3.4.x')
-    do: [ 
-      spec
-        package: 'Grease-GemStone-Core'
-          with: [ spec includes: #('Grease-GemStone330-Core') ];
-        package: 'Grease-GemStone330-Core'
-          with: [ 
-              spec
-                requires: #('Grease-GemStone-Core');
-                postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
-  spec
-    for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
-    do: [ 
-      spec
-        package: 'Grease-Tests-GemStone-Core'
-        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
\ No newline at end of file
+	self baselineCommon: spec.
+	self baselineSqueak: spec.
+	self baselinePharo: spec.
+	self baselineGemStone: spec
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st
new file mode 100644
index 00000000..27dff798
--- /dev/null
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st
@@ -0,0 +1,16 @@
+baseline
+baselineCommon: spec
+	spec
+		for: #common
+		do: [ spec blessing: #baseline.
+			spec
+				package: 'Grease-Core';
+				package: 'Grease-Tests-Core'
+					with: [ spec requires: #('Grease-Core') ].
+			spec
+				group: 'Core' with: #('Grease-Core');
+				group: 'Core Tests' with: #('Grease-Tests-Core');
+				group: 'Slime' with: #('Core');
+				group: 'Slime Tests' with: #('Core Tests');
+				group: 'Tests' with: #('Core Tests' 'Slime Tests');
+				group: 'default' with: #('Slime') ]
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st
new file mode 100644
index 00000000..d7cf41be
--- /dev/null
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st
@@ -0,0 +1,97 @@
+baseline
+baselineGemStone: spec
+  spec
+    for: #'gemstone'
+    do: [ 
+      spec
+        project: 'GsCore'
+          with: [ 
+              spec
+                className: 'ConfigurationOfGsCore';
+                versionString: #'stable';
+                repository:
+                    'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
+        project: 'UTF8'
+          with: [ 
+              spec
+                className: 'ConfigurationOfGsMisc';
+                versionString: #'stable';
+                loads: #('Utf8Encoding');
+                repository:
+                    'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
+        project: 'System-Digital-Signatures'
+          copyFrom: 'UTF8'
+          with: [ spec loads: #('System-Digital-Signatures') ];
+        project: 'SMTPMail'
+          copyFrom: 'UTF8'
+          with: [ spec loads: #('SMTPMail') ].
+      spec
+        package: 'Grease-Core'
+          with: [ 
+              spec
+                requires: #('GsCore');
+                includes: #('Grease-GemStone-Core') ];
+        package: 'Grease-Tests-Core'
+          with: [ 
+              spec
+                requires: #('Grease-GemStone-Core');
+                includes: #('Grease-Tests-GemStone-Core') ];
+        package: 'Grease-GemStone-Core'
+          with: [ 
+              spec
+                requires:
+                  #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
+        package: 'Grease-Tests-GemStone-Core'
+          with: [ spec requires: #('Grease-Tests-Core') ] ].
+  spec
+    for: #'gs2.x'
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone200-Core') ];
+        package: 'Grease-GemStone200-Core'
+          with: [ spec requires: #('Grease-GemStone-Core') ] ].
+  spec
+    for: #'gs2.3.x'
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone230-Core') ];
+        package: 'Grease-GemStone230-Core'
+          with: [ spec requires: #('Grease-GemStone-Core') ] ].
+  spec
+    for: #'gs2.4.x'
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone240-Core') ];
+        package: 'Grease-GemStone240-Core'
+          with: [ spec requires: #('Grease-GemStone-Core') ] ].
+  spec
+    for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone300-Core') ];
+        package: 'Grease-GemStone300-Core'
+          with: [ 
+              spec
+                requires: #('Grease-GemStone-Core');
+                postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
+  spec
+    for: #(#'gs3.3.x' #'gs3.4.x')
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone330-Core') ];
+        package: 'Grease-GemStone330-Core'
+          with: [ 
+              spec
+                requires: #('Grease-GemStone-Core');
+                postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
+  spec
+    for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
+    do: [ 
+      spec
+        package: 'Grease-Tests-GemStone-Core'
+        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
new file mode 100644
index 00000000..8182da7d
--- /dev/null
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
@@ -0,0 +1,62 @@
+baselines
+baselinePharo: spec
+	spec
+		for: #(#'pharo4.x' #'pharo5.x')
+		do: [ spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Pharo30-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Pharo30-Core');
+						includes: #('Grease-Tests-Pharo-Core') ];
+				package: 'Grease-Pharo30-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Pharo-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Pharo40-Slime'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Pharo40-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Pharo40-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
+	spec
+		for: #'pharo6.x'
+		do: [ spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Pharo60-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Pharo60-Core');
+						includes: #('Grease-Tests-Pharo-Core') ];
+				package: 'Grease-Pharo60-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Pharo-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Pharo40-Slime'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Pharo40-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Pharo40-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
+	spec
+		for: #(#'pharo7.x')
+		do: [ spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Pharo70-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Pharo70-Core');
+						includes: #('Grease-Tests-Pharo-Core') ];
+				package: 'Grease-Pharo70-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Pharo-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Pharo40-Slime'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Pharo40-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Pharo40-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st
new file mode 100644
index 00000000..4c106e4b
--- /dev/null
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st
@@ -0,0 +1,62 @@
+baseline
+baselineSqueak: spec
+	spec
+		for: #(#'squeak5.x')
+		do: [ 
+			spec
+				project: 'Refactoring-Core'
+				with: [ spec
+						className: 'ConfigurationOfRefactoringBrowser';
+						versionString: #stable;
+						loads: #('Core');
+						repository: 'http://www.squeaksource.com/MetacelloRepository' ].
+			spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Squeak5-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Squeak5-Core');
+						includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
+				package: 'Grease-Squeak5-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Squeak-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Tests-Squeak5-Core'
+					with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
+				package: 'Grease-Slime'
+					with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
+	spec
+		for: #(#'squeak6.x')
+		do: [
+			spec
+				project: 'Refactoring-Core'
+				with: [ spec
+						className: 'ConfigurationOfRefactoringBrowser';
+						versionString: #stable;
+						loads: #('Core');
+						repository: 'http://www.squeaksource.com/MetacelloRepository' ].
+			spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Squeak6-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Squeak6-Core');
+						includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
+				package: 'Grease-Squeak6-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Squeak-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Tests-Squeak6-Core'
+					with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
+				package: 'Grease-Slime' 
+					with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/initializeLatin1ToUtf8Encodings.st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/initializeLatin1ToUtf8Encodings.st
index 2aff264b..6d1af9c5 100644
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/initializeLatin1ToUtf8Encodings.st
+++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/initializeLatin1ToUtf8Encodings.st
@@ -1,4 +1,4 @@
 doits
 initializeLatin1ToUtf8Encodings
-
-	GRUtf8CodecStream initialize
\ No newline at end of file
+	"Gemstone only"
+	(Smalltalk at: #GRUtf8CodecStream) initialize
\ No newline at end of file
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st
deleted file mode 100644
index fa336694..00000000
--- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st
+++ /dev/null
@@ -1,16 +0,0 @@
-baseline
-slimeForSqueakPharo1xPharo2x: spec
-	spec
-		project: 'Refactoring-Core'
-		with: [ 
-			spec
-				className: 'ConfigurationOfRefactoringBrowser';
-				versionString: #stable;
-				loads: #('Core');
-				repository: 'http://www.squeaksource.com/MetacelloRepository' ].
-	spec
-		package: 'Grease-Slime' with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
-		package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Slime') ].
-	^ spec
-		group: 'Slime' with: #('Grease-Slime');
-		group: 'Slime Tests' with: #('Grease-Tests-Slime')
\ No newline at end of file