diff --git a/src/BaselineOfChanel/BaselineOfChanel.class.st b/src/BaselineOfChanel/BaselineOfChanel.class.st
index 5332d27..482da2c 100644
--- a/src/BaselineOfChanel/BaselineOfChanel.class.st
+++ b/src/BaselineOfChanel/BaselineOfChanel.class.st
@@ -9,6 +9,7 @@ Class {
 
 { #category : #baselines }
 BaselineOfChanel >> baseline: spec [
+
 	<baseline>
 	spec for: #common do: [
 		self
@@ -23,6 +24,16 @@ BaselineOfChanel >> baseline: spec [
 			group: 'Core' with: #( 'Chanel' );
 			group: 'Tests' with: #( 'Chanel-Tests' ) ].
 
+	spec for: (self pharoVersionsFrom: 11) do: [
+		spec
+			package: 'Chanel-Pharo11Plus' with: [ spec requires: #( 'Chanel' ) ];
+			package: 'Chanel-Pharo11Plus-Tests' with: [ spec requires: #( 'Chanel-Tests' 'Chanel-Pharo11Plus' ) ].
+
+
+		spec
+			group: 'Core' with: #( 'Chanel-Pharo11Plus' );
+			group: 'Tests' with: #( 'Chanel-Pharo11Plus-Tests' ) ].
+
 	spec for: #( #'pharo7.x' ) do: [
 		self pharoBackwardCompatibility: spec.
 		spec
@@ -56,6 +67,11 @@ BaselineOfChanel >> pharoBackwardCompatibility: spec [
     	with: [ spec repository: 'github://jecisc/PharoBackwardCompatibility:v1.x.x/src' ]
 ]
 
+{ #category : #baselines }
+BaselineOfChanel >> pharoVersionsFrom: aVersion [
+	^ (aVersion to: SystemVersion current major) collect: [ :v | ('pharo' , v asString , '.x') asSymbol ]
+]
+
 { #category : #accessing }
 BaselineOfChanel >> projectClass [
 	^ MetacelloCypressBaselineProject
diff --git a/src/Chanel-Tests/ChanelCondenseMethodsCleanerTest.class.st b/src/Chanel-Pharo11Plus-Tests/ChanelCondenseMethodsCleanerTest.class.st
similarity index 93%
rename from src/Chanel-Tests/ChanelCondenseMethodsCleanerTest.class.st
rename to src/Chanel-Pharo11Plus-Tests/ChanelCondenseMethodsCleanerTest.class.st
index f51425a..aec988f 100644
--- a/src/Chanel-Tests/ChanelCondenseMethodsCleanerTest.class.st
+++ b/src/Chanel-Pharo11Plus-Tests/ChanelCondenseMethodsCleanerTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #ChanelCondenseMethodsCleanerTest,
 	#superclass : #ChanelAbstractCleanerTest,
-	#category : #'Chanel-Tests'
+	#category : #'Chanel-Pharo11Plus-Tests'
 }
 
 { #category : #running }
diff --git a/src/Chanel-Pharo11Plus-Tests/package.st b/src/Chanel-Pharo11Plus-Tests/package.st
new file mode 100644
index 0000000..c63c652
--- /dev/null
+++ b/src/Chanel-Pharo11Plus-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : #'Chanel-Pharo11Plus-Tests' }
diff --git a/src/Chanel/ChanelCondenseMethodsCleaner.class.st b/src/Chanel-Pharo11Plus/ChanelCondenseMethodsCleaner.class.st
similarity index 92%
rename from src/Chanel/ChanelCondenseMethodsCleaner.class.st
rename to src/Chanel-Pharo11Plus/ChanelCondenseMethodsCleaner.class.st
index e8ad208..b34a563 100644
--- a/src/Chanel/ChanelCondenseMethodsCleaner.class.st
+++ b/src/Chanel-Pharo11Plus/ChanelCondenseMethodsCleaner.class.st
@@ -7,7 +7,7 @@ I am a cleaner that removes useless spaces at the end of lines and final dots of
 Class {
 	#name : #ChanelCondenseMethodsCleaner,
 	#superclass : #ChanelAbstractCleaner,
-	#category : #Chanel
+	#category : #'Chanel-Pharo11Plus'
 }
 
 { #category : #cleaning }
diff --git a/src/Chanel-Pharo11Plus/package.st b/src/Chanel-Pharo11Plus/package.st
new file mode 100644
index 0000000..89723de
--- /dev/null
+++ b/src/Chanel-Pharo11Plus/package.st
@@ -0,0 +1 @@
+Package { #name : #'Chanel-Pharo11Plus' }