diff --git a/src/BaselineOfIDE/BaselineOfIDE.class.st b/src/BaselineOfIDE/BaselineOfIDE.class.st
index 7e90d66402a..d877b036d0b 100644
--- a/src/BaselineOfIDE/BaselineOfIDE.class.st
+++ b/src/BaselineOfIDE/BaselineOfIDE.class.st
@@ -243,15 +243,12 @@ BaselineOfIDE >> baseline: spec [
 		spec package: 'SmartSuggestions'.
 		
 		spec package: 'OpalCompiler-Tools'.
-
-		spec package: 'OSWindow-Core'.
-		spec package: 'OSWindow-SDL2'.
-		spec package: 'OSWindow-VM'.
 				
 		spec package: 'GeneralRules'.
 		spec package: 'GeneralRules-Tests'.
 		spec package: 'FuzzyMatcher'.
 		
+		spec baseline: 'OSWindow' with: [ spec repository: repository ].
 		spec baseline: 'Refactoring' with: [ spec repository: repository ].
 		spec baseline: 'Catalog' with: [ spec repository: repository ].
 		spec baseline: 'Epicea' with: [ spec repository: repository ].
@@ -282,8 +279,6 @@ BaselineOfIDE >> baseline: spec [
 		spec package: 'Jobs-Tests'.
 		spec package: 'Manifest-Tests'.
 		spec package: 'Multilingual-Tests'.
-		spec package: 'OSWindow-SDL2-Examples'.
-		spec package: 'OSWindow-Tests'.
 		spec package: 'Pharo-Help'.
 		spec package: 'Random-Tests'.
 		spec package: 'ReflectionMirrors-Primitives-Tests'.
@@ -511,23 +506,6 @@ spec group: 'DependencyAnalyser-Group' with: #(
 	'DependencyAnalyser-Tests-Group'
 ).	
 
-spec group: 'OSWindow-Core-Group' with: #(
-	'Glamour-Core-Group'	"dependency, cleanup needed"
-	'GT-Core-Group'	"dependency, cleanup needed"
-	'Athens' "dependency"
-	'OSWindow-Core'
-	'OSWindow-SDL2'
-	'OSWindow-VM'
-	'OSWindow-SDL2-Examples'
-).	
-spec group: 'OSWindow-Tests-Group' with: #(
-	'OSWindow-Tests'
-).
-spec group: 'OSWindow-Group' with: #(
-	'OSWindow-Core-Group'
-	'OSWindow-Tests-Group'
-).
-
 spec group: 'Kernel-Tests-Group' with: #(
 	'CodeImport-Tests'	 
 	'Collections-Tests'
@@ -599,7 +577,7 @@ spec group: #default with: #(
 	'GT&QA-Group'
 
 	"standalone but dependent:"
-	'OSWindow-Group'
+	'OSWindow'
 	'Refactoring'
 	'Catalog'
 	'Epicea'
diff --git a/src/BaselineOfOSWindow/BaselineOfOSWindow.class.st b/src/BaselineOfOSWindow/BaselineOfOSWindow.class.st
new file mode 100644
index 00000000000..1cd983a5a24
--- /dev/null
+++ b/src/BaselineOfOSWindow/BaselineOfOSWindow.class.st
@@ -0,0 +1,21 @@
+Class {
+	#name : #BaselineOfOSWindow,
+	#superclass : #BaselineOf,
+	#category : #BaselineOfOSWindow
+}
+
+{ #category : #baselines }
+BaselineOfOSWindow >> baseline: spec [
+	<baseline>
+	spec for: #'common' do: [
+		spec 
+			package: 'OSWindow-Core';
+			package: 'OSWindow-SDL2';
+			package: 'OSWindow-VM';
+			package: 'OSWindow-SDL2-Examples';
+			package: 'OSWindow-Tests'.
+		spec 
+			group: 'Core' with: #('OSWindow-Core' 'OSWindow-SDL2' 'OSWindow-VM' 'OSWindow-SDL2-Examples');
+			group: 'Tests' with: #('OSWindow-Tests');
+			group: 'default' with: #('Core' 'Tests') ]
+]
diff --git a/src/BaselineOfOSWindow/package.st b/src/BaselineOfOSWindow/package.st
new file mode 100644
index 00000000000..f146e9b913b
--- /dev/null
+++ b/src/BaselineOfOSWindow/package.st
@@ -0,0 +1 @@
+Package { #name : #BaselineOfOSWindow }