diff --git a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
index a5add2ab..8899f4bd 100644
--- a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
+++ b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
@@ -16,8 +16,8 @@ BaselineOfOpenPonk >> baseline: spec [
 		self externalProjectsBaseline: spec.
 		self internalProjectsBaseline: spec.
 		spec
-			package: 'OpenPonk-Roassal3'
-			with: [ spec preLoadDoIt: #loadRoassal3 ];
+			package: 'OpenPonk-Roassal'
+			with: [ spec preLoadDoIt: #loadRoassal ];
 			package: 'OpenPonk-Core' with: [
 				spec requires:
 						#( 'Magritte' 'Mocketry' 'XMLParser' 'XPath' 'NeoJSON' 'OpenPonk-Roassal3' ) ];
@@ -26,7 +26,7 @@ BaselineOfOpenPonk >> baseline: spec [
 				spec
 					requires:
 						#( 'NewTools' 'Magritte' 'SynchronizedLinks' 'OpenPonk-Morphic' );
-					preLoadDoIt: #loadPetitParserAndRoassal3 ].
+					preLoadDoIt: #loadPetitParserAndRoassal ].
 		spec
 			group: 'default'
 			with: #( 'OpenPonk-Core' 'OpenPonk-Morphic' 'OpenPonk-Spec' ) ]
@@ -87,35 +87,46 @@ BaselineOfOpenPonk >> loadPetitParser [
 ]
 
 { #category : #baselines }
-BaselineOfOpenPonk >> loadPetitParserAndRoassal3 [
+BaselineOfOpenPonk >> loadPetitParserAndRoassal [
 
 	"PetitParser is not needed by core OP. It is needed by BormEditor, but due to Pharo bug https://github.com/pharo-project/pharo/issues/9913 it must be always loaded before Roassal in Pharo 10"
 
 	self
 		loadPetitParser;
-		loadRoassal3
+		loadRoassal
 ]
 
 { #category : #baselines }
-BaselineOfOpenPonk >> loadRoassal3 [
+BaselineOfOpenPonk >> loadRoassal [
 	"Roassal3 needs to be loaded this way because different version of it is already included in Pharo 10+"
 
-	| exporters |
-	Smalltalk at: #BaselineOfRoassal3Exporters ifPresent: [ ^ self ].
+	| exporters layouts |
+	
+	Smalltalk at: #BaselineOfRoassalExporters ifPresent: [ ^ self ].
+
+	layouts := Metacello new.
+	layouts
+		baseline: 'RoassalLayouts';
+		repository: 'github://pharo-graphics/RoassalLayouts:136a902';
+		lock;
+		onConflictUseLoaded.
 
 	exporters := Metacello new.
 	exporters
-		baseline: 'Roassal3Exporters';
-		repository: 'github://ObjectProfile/Roassal3Exporters:6c61b1f';
+		baseline: 'RoassalExporters';
+		repository: 'github://pharo-graphics/RoassalExporters:v1.01';
 		lock;
 		onConflictUseLoaded.
+		
 	[
 	Metacello new
-		baseline: 'Roassal3';
-		repository: 'github://ObjectProfile/Roassal3:v1.03';
+		baseline: 'Roassal';
+		repository: 'github://pharo-graphics/Roassal:b508334';
 		lock;
 		load: #Full ]
 		on: MCMergeOrLoadWarning
 		do: [ :warning | warning load ].
+		
+	layouts load.
 	exporters load
 ]
diff --git a/repository/OpenPonk-Roassal3/Announcer.extension.st b/repository/OpenPonk-Roassal/Announcer.extension.st
similarity index 91%
rename from repository/OpenPonk-Roassal3/Announcer.extension.st
rename to repository/OpenPonk-Roassal/Announcer.extension.st
index 9a186f35..8264216e 100644
--- a/repository/OpenPonk-Roassal3/Announcer.extension.st
+++ b/repository/OpenPonk-Roassal/Announcer.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Announcer }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Announcer >> suspendAllOf: anObject while: aBlock [
 
 	| originalSubscriptions result |
diff --git a/repository/OpenPonk-Roassal3/Color.extension.st b/repository/OpenPonk-Roassal/Color.extension.st
similarity index 84%
rename from repository/OpenPonk-Roassal3/Color.extension.st
rename to repository/OpenPonk-Roassal/Color.extension.st
index 1f3450a5..d4f63930 100644
--- a/repository/OpenPonk-Roassal3/Color.extension.st
+++ b/repository/OpenPonk-Roassal/Color.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Color }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Color >> withTransparencyAsWhite [
 
 	^ self class
diff --git a/repository/OpenPonk-Roassal3/Float.extension.st b/repository/OpenPonk-Roassal/Float.extension.st
similarity index 91%
rename from repository/OpenPonk-Roassal3/Float.extension.st
rename to repository/OpenPonk-Roassal/Float.extension.st
index 526f7299..5fbfbede 100644
--- a/repository/OpenPonk-Roassal3/Float.extension.st
+++ b/repository/OpenPonk-Roassal/Float.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Float }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Float >> closeTo: num absolutePrecision: aPrecision [
 
 	"Tell whether the receiver and arguments are close from each other given a absolute precision"
diff --git a/repository/OpenPonk-Roassal3/GEllipse.extension.st b/repository/OpenPonk-Roassal/GEllipse.extension.st
similarity index 68%
rename from repository/OpenPonk-Roassal3/GEllipse.extension.st
rename to repository/OpenPonk-Roassal/GEllipse.extension.st
index 46b83cba..4b4c68ac 100644
--- a/repository/OpenPonk-Roassal3/GEllipse.extension.st
+++ b/repository/OpenPonk-Roassal/GEllipse.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GEllipse }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> bottom [
 
 	^ coVertex y max: center y + center y - coVertex y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> left [
 
 	^ vertex x min: center x + center x - vertex x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> right [
 
 	^ vertex x max: center x + center x - vertex x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> top [
 
 	^ coVertex y min: center y + center y - coVertex y
diff --git a/repository/OpenPonk-Roassal3/GPoint.extension.st b/repository/OpenPonk-Roassal/GPoint.extension.st
similarity index 50%
rename from repository/OpenPonk-Roassal3/GPoint.extension.st
rename to repository/OpenPonk-Roassal/GPoint.extension.st
index 5f3016ea..659dbeb0 100644
--- a/repository/OpenPonk-Roassal3/GPoint.extension.st
+++ b/repository/OpenPonk-Roassal/GPoint.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GPoint }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> bottom [
 
 	^ self y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> left [
 
 	^ self x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> right [
 
 	^ self x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> top [
 
 	^ self y
diff --git a/repository/OpenPonk-Roassal3/GPolygon.extension.st b/repository/OpenPonk-Roassal/GPolygon.extension.st
similarity index 63%
rename from repository/OpenPonk-Roassal3/GPolygon.extension.st
rename to repository/OpenPonk-Roassal/GPolygon.extension.st
index 93dfa7d9..96b6b109 100644
--- a/repository/OpenPonk-Roassal3/GPolygon.extension.st
+++ b/repository/OpenPonk-Roassal/GPolygon.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GPolygon }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> bottom [
 
 	^ self encompassingRectangle bottom
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> left [
 
 	^ self encompassingRectangle left
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> right [
 
 	^ self encompassingRectangle right
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> top [
 
 	^ self encompassingRectangle top
diff --git a/repository/OpenPonk-Roassal3/GRectangle.extension.st b/repository/OpenPonk-Roassal/GRectangle.extension.st
similarity index 61%
rename from repository/OpenPonk-Roassal3/GRectangle.extension.st
rename to repository/OpenPonk-Roassal/GRectangle.extension.st
index 0660e53c..d90d6ad4 100644
--- a/repository/OpenPonk-Roassal3/GRectangle.extension.st
+++ b/repository/OpenPonk-Roassal/GRectangle.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GRectangle }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> bottom [
 
 	^ (self vertices at: 3) y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> left [
 
 	^ (self vertices at: 1) x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> right [
 
 	^ (self vertices at: 3) x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> top [
 
 	^ (self vertices at: 1) y
diff --git a/repository/OpenPonk-Roassal3/GSegment.extension.st b/repository/OpenPonk-Roassal/GSegment.extension.st
similarity index 56%
rename from repository/OpenPonk-Roassal3/GSegment.extension.st
rename to repository/OpenPonk-Roassal/GSegment.extension.st
index 13156259..b4174507 100644
--- a/repository/OpenPonk-Roassal3/GSegment.extension.st
+++ b/repository/OpenPonk-Roassal/GSegment.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GSegment }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> bottom [
 
 	^ v1 y max: v2 y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> left [
 
 	^ v1 x min: v2 x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> right [
 
 	^ v1 x max: v2 x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> top [
 
 	^ v1 y min: v2 y
diff --git a/repository/OpenPonk-Roassal3/Number.extension.st b/repository/OpenPonk-Roassal/Number.extension.st
similarity index 88%
rename from repository/OpenPonk-Roassal3/Number.extension.st
rename to repository/OpenPonk-Roassal/Number.extension.st
index ff9509d5..ed3e22b2 100644
--- a/repository/OpenPonk-Roassal3/Number.extension.st
+++ b/repository/OpenPonk-Roassal/Number.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Number }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Number >> closeTo: num absolutePrecision: aPrecision [
 	"are these two numbers close?"
 
diff --git a/repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st b/repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st
similarity index 96%
rename from repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st
rename to repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st
index 6e083d27..3d36b4f9 100644
--- a/repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st
@@ -6,7 +6,7 @@ Class {
 		'line',
 		'shape'
 	],
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st b/repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st
similarity index 96%
rename from repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st
rename to repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st
index 79521509..cc73ac3c 100644
--- a/repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'feedback'
 	],
-	#category : #'OpenPonk-Roassal3-CreationFeedback'
+	#category : #'OpenPonk-Roassal-CreationFeedback'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRSAdornment.class.st b/repository/OpenPonk-Roassal/OPRSAdornment.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSAdornment.class.st
rename to repository/OpenPonk-Roassal/OPRSAdornment.class.st
index 3c5b8b15..eeffd457 100644
--- a/repository/OpenPonk-Roassal3/OPRSAdornment.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAdornment.class.st
@@ -7,7 +7,7 @@ Class {
 		'shape',
 		'padding'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'instance creation' }
diff --git a/repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st b/repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st
similarity index 97%
rename from repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st
rename to repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st
index a8bb9651..9d2a9b60 100644
--- a/repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st
@@ -8,7 +8,7 @@ Class {
 		'verticalLocation',
 		'horizontalLocation'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #adding }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st
similarity index 99%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st
index 02102470..4a87a405 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st
@@ -11,7 +11,7 @@ Class {
 		'positionReference',
 		'alwaysShowGuideLine'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #building }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st
similarity index 96%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st
index 1d174f9c..705eb106 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'balance'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'instance creation' }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st
similarity index 94%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st
index fcb4db73..124c4f97 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSAnchorConstraintEndDistanceReference,
 	#superclass : #OPRSAnchorConstraintFixedDistanceReference,
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st
similarity index 97%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st
index 7e741e65..99383719 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'distance'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st
similarity index 97%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st
index 14e1af9d..c71704fc 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st
@@ -7,7 +7,7 @@ Class {
 		'previousSegmentsLength',
 		'lineLength'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #calculated }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st
similarity index 93%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st
index 3c7169a8..3777fb00 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSAnchorConstraintReference,
 	#superclass : #RSObject,
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st
index 3650c1ed..7ef9a374 100644
Binary files a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st and b/repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st differ
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintStartDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintStartDistanceReference.class.st
similarity index 94%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintStartDistanceReference.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintStartDistanceReference.class.st
index cf1a9b61..f68e16be 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintStartDistanceReference.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintStartDistanceReference.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSAnchorConstraintStartDistanceReference,
 	#superclass : #OPRSAnchorConstraintFixedDistanceReference,
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintUpdater.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintUpdater.class.st
similarity index 99%
rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintUpdater.class.st
rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintUpdater.class.st
index 0b2ca10d..74abeaae 100644
--- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintUpdater.class.st
+++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintUpdater.class.st
@@ -14,7 +14,7 @@ Class {
 		'extraDistance',
 		'positionReference'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #building }
diff --git a/repository/OpenPonk-Roassal3/OPRSBezier.class.st b/repository/OpenPonk-Roassal/OPRSBezier.class.st
similarity index 93%
rename from repository/OpenPonk-Roassal3/OPRSBezier.class.st
rename to repository/OpenPonk-Roassal/OPRSBezier.class.st
index 57ec90e7..11b05bb6 100644
--- a/repository/OpenPonk-Roassal3/OPRSBezier.class.st
+++ b/repository/OpenPonk-Roassal/OPRSBezier.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSBezier,
 	#superclass : #RSBezier,
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSBezier.extension.st b/repository/OpenPonk-Roassal/OPRSBezier.extension.st
similarity index 100%
rename from repository/OpenPonk-Roassal3/OPRSBezier.extension.st
rename to repository/OpenPonk-Roassal/OPRSBezier.extension.st
diff --git a/repository/OpenPonk-Roassal3/OPRSCanvasADFeedback.class.st b/repository/OpenPonk-Roassal/OPRSCanvasADFeedback.class.st
similarity index 84%
rename from repository/OpenPonk-Roassal3/OPRSCanvasADFeedback.class.st
rename to repository/OpenPonk-Roassal/OPRSCanvasADFeedback.class.st
index f2a23ce0..e0937833 100644
--- a/repository/OpenPonk-Roassal3/OPRSCanvasADFeedback.class.st
+++ b/repository/OpenPonk-Roassal/OPRSCanvasADFeedback.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSCanvasADFeedback,
 	#superclass : #OPRSAcceptDenyFeedbackBuilder,
-	#category : #'OpenPonk-Roassal3-CreationFeedback'
+	#category : #'OpenPonk-Roassal-CreationFeedback'
 }
 
 { #category : #private }
diff --git a/repository/OpenPonk-Roassal3/OPRSConditionallyDraggable.class.st b/repository/OpenPonk-Roassal/OPRSConditionallyDraggable.class.st
similarity index 93%
rename from repository/OpenPonk-Roassal3/OPRSConditionallyDraggable.class.st
rename to repository/OpenPonk-Roassal/OPRSConditionallyDraggable.class.st
index 3a8f39ce..259964f0 100644
--- a/repository/OpenPonk-Roassal3/OPRSConditionallyDraggable.class.st
+++ b/repository/OpenPonk-Roassal/OPRSConditionallyDraggable.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'conditionBlock'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #initialization }
diff --git a/repository/OpenPonk-Roassal3/OPRSControlConfiguration.class.st b/repository/OpenPonk-Roassal/OPRSControlConfiguration.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSControlConfiguration.class.st
rename to repository/OpenPonk-Roassal/OPRSControlConfiguration.class.st
index eb4874d1..3c205cda 100644
--- a/repository/OpenPonk-Roassal3/OPRSControlConfiguration.class.st
+++ b/repository/OpenPonk-Roassal/OPRSControlConfiguration.class.st
@@ -12,7 +12,7 @@ Class {
 		'dragAttachmentMargin',
 		'dragSnapComparisonsAmount'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSControlPointCreatorHandle.class.st b/repository/OpenPonk-Roassal/OPRSControlPointCreatorHandle.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSControlPointCreatorHandle.class.st
rename to repository/OpenPonk-Roassal/OPRSControlPointCreatorHandle.class.st
index b48a42bf..a1756dee 100644
--- a/repository/OpenPonk-Roassal3/OPRSControlPointCreatorHandle.class.st
+++ b/repository/OpenPonk-Roassal/OPRSControlPointCreatorHandle.class.st
@@ -7,7 +7,7 @@ Class {
 		'nearStart',
 		'nearEnd'
 	],
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRSCustomScaleCamSetter.class.st b/repository/OpenPonk-Roassal/OPRSCustomScaleCamSetter.class.st
similarity index 96%
rename from repository/OpenPonk-Roassal3/OPRSCustomScaleCamSetter.class.st
rename to repository/OpenPonk-Roassal/OPRSCustomScaleCamSetter.class.st
index 65a1b0e2..e0a5befb 100644
--- a/repository/OpenPonk-Roassal3/OPRSCustomScaleCamSetter.class.st
+++ b/repository/OpenPonk-Roassal/OPRSCustomScaleCamSetter.class.st
@@ -5,7 +5,7 @@ Class {
 		'scale',
 		'padding'
 	],
-	#category : #'OpenPonk-Roassal3-Exports'
+	#category : #'OpenPonk-Roassal-Exports'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionEnd.class.st b/repository/OpenPonk-Roassal/OPRSDragFromSelectionEnd.class.st
similarity index 64%
rename from repository/OpenPonk-Roassal3/OPRSDragFromSelectionEnd.class.st
rename to repository/OpenPonk-Roassal/OPRSDragFromSelectionEnd.class.st
index 16d32438..14833100 100644
--- a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionEnd.class.st
+++ b/repository/OpenPonk-Roassal/OPRSDragFromSelectionEnd.class.st
@@ -1,5 +1,5 @@
 Class {
 	#name : #OPRSDragFromSelectionEnd,
 	#superclass : #RSAbstractMouseEvent,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
diff --git a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionStart.class.st b/repository/OpenPonk-Roassal/OPRSDragFromSelectionStart.class.st
similarity index 64%
rename from repository/OpenPonk-Roassal3/OPRSDragFromSelectionStart.class.st
rename to repository/OpenPonk-Roassal/OPRSDragFromSelectionStart.class.st
index 12c40531..75ef526d 100644
--- a/repository/OpenPonk-Roassal3/OPRSDragFromSelectionStart.class.st
+++ b/repository/OpenPonk-Roassal/OPRSDragFromSelectionStart.class.st
@@ -1,5 +1,5 @@
 Class {
 	#name : #OPRSDragFromSelectionStart,
 	#superclass : #RSAbstractMouseEvent,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
diff --git a/repository/OpenPonk-Roassal3/OPRSDraggableCPController.class.st b/repository/OpenPonk-Roassal/OPRSDraggableCPController.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSDraggableCPController.class.st
rename to repository/OpenPonk-Roassal/OPRSDraggableCPController.class.st
index 6a71038f..be85bfcb 100644
--- a/repository/OpenPonk-Roassal3/OPRSDraggableCPController.class.st
+++ b/repository/OpenPonk-Roassal/OPRSDraggableCPController.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'selfLineDistance'
 	],
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #'instance creation' }
diff --git a/repository/OpenPonk-Roassal3/OPRSDraggableControlPointHandle.class.st b/repository/OpenPonk-Roassal/OPRSDraggableControlPointHandle.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSDraggableControlPointHandle.class.st
rename to repository/OpenPonk-Roassal/OPRSDraggableControlPointHandle.class.st
index 867b986d..4588938d 100644
--- a/repository/OpenPonk-Roassal3/OPRSDraggableControlPointHandle.class.st
+++ b/repository/OpenPonk-Roassal/OPRSDraggableControlPointHandle.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'indexOfControlPoint'
 	],
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSDraggableControlPoints.class.st b/repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSDraggableControlPoints.class.st
rename to repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st
index b828bdfa..3f6283ee 100644
--- a/repository/OpenPonk-Roassal3/OPRSDraggableControlPoints.class.st
+++ b/repository/OpenPonk-Roassal/OPRSDraggableControlPoints.class.st
@@ -8,7 +8,7 @@ Class {
 		'line',
 		'canvas'
 	],
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #private }
diff --git a/repository/OpenPonk-Roassal3/OPRSDraggedControlPointsEvent.class.st b/repository/OpenPonk-Roassal/OPRSDraggedControlPointsEvent.class.st
similarity index 67%
rename from repository/OpenPonk-Roassal3/OPRSDraggedControlPointsEvent.class.st
rename to repository/OpenPonk-Roassal/OPRSDraggedControlPointsEvent.class.st
index 225171a2..743b7d25 100644
--- a/repository/OpenPonk-Roassal3/OPRSDraggedControlPointsEvent.class.st
+++ b/repository/OpenPonk-Roassal/OPRSDraggedControlPointsEvent.class.st
@@ -1,5 +1,5 @@
 Class {
 	#name : #OPRSDraggedControlPointsEvent,
 	#superclass : #RSPositionChangedEvent,
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
diff --git a/repository/OpenPonk-Roassal3/OPRSEmptyMarker.class.st b/repository/OpenPonk-Roassal/OPRSEmptyMarker.class.st
similarity index 85%
rename from repository/OpenPonk-Roassal3/OPRSEmptyMarker.class.st
rename to repository/OpenPonk-Roassal/OPRSEmptyMarker.class.st
index dcc932f1..af5d9683 100644
--- a/repository/OpenPonk-Roassal3/OPRSEmptyMarker.class.st
+++ b/repository/OpenPonk-Roassal/OPRSEmptyMarker.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSEmptyMarker,
 	#superclass : #RSMarker,
-	#category : #'OpenPonk-Roassal3-Markers'
+	#category : #'OpenPonk-Roassal-Markers'
 }
 
 { #category : #converting }
diff --git a/repository/OpenPonk-Roassal3/OPRSEmptyMarkerBuilder.class.st b/repository/OpenPonk-Roassal/OPRSEmptyMarkerBuilder.class.st
similarity index 87%
rename from repository/OpenPonk-Roassal3/OPRSEmptyMarkerBuilder.class.st
rename to repository/OpenPonk-Roassal/OPRSEmptyMarkerBuilder.class.st
index 6aed7471..1faf5003 100644
--- a/repository/OpenPonk-Roassal3/OPRSEmptyMarkerBuilder.class.st
+++ b/repository/OpenPonk-Roassal/OPRSEmptyMarkerBuilder.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSEmptyMarkerBuilder,
 	#superclass : #OPRSMarkerBuilder,
-	#category : #'OpenPonk-Roassal3-Markers'
+	#category : #'OpenPonk-Roassal-Markers'
 }
 
 { #category : #examples }
diff --git a/repository/OpenPonk-Roassal3/OPRSEmptyShapeProxy.class.st b/repository/OpenPonk-Roassal/OPRSEmptyShapeProxy.class.st
similarity index 93%
rename from repository/OpenPonk-Roassal3/OPRSEmptyShapeProxy.class.st
rename to repository/OpenPonk-Roassal/OPRSEmptyShapeProxy.class.st
index 16715976..a8031dfc 100644
--- a/repository/OpenPonk-Roassal3/OPRSEmptyShapeProxy.class.st
+++ b/repository/OpenPonk-Roassal/OPRSEmptyShapeProxy.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'shape'
 	],
-	#category : #'OpenPonk-Roassal3-Markers'
+	#category : #'OpenPonk-Roassal-Markers'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSKeyNavigationCanvasInteraction.class.st b/repository/OpenPonk-Roassal/OPRSKeyNavigationCanvasInteraction.class.st
similarity index 91%
rename from repository/OpenPonk-Roassal3/OPRSKeyNavigationCanvasInteraction.class.st
rename to repository/OpenPonk-Roassal/OPRSKeyNavigationCanvasInteraction.class.st
index ac846322..e5048182 100644
--- a/repository/OpenPonk-Roassal3/OPRSKeyNavigationCanvasInteraction.class.st
+++ b/repository/OpenPonk-Roassal/OPRSKeyNavigationCanvasInteraction.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSKeyNavigationCanvasInteraction,
 	#superclass : #RSKeyNavigationCanvasInteraction,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #events }
diff --git a/repository/OpenPonk-Roassal3/OPRSLabeled.class.st b/repository/OpenPonk-Roassal/OPRSLabeled.class.st
similarity index 96%
rename from repository/OpenPonk-Roassal3/OPRSLabeled.class.st
rename to repository/OpenPonk-Roassal/OPRSLabeled.class.st
index e5d259ff..2f09e480 100644
--- a/repository/OpenPonk-Roassal3/OPRSLabeled.class.st
+++ b/repository/OpenPonk-Roassal/OPRSLabeled.class.st
@@ -5,7 +5,7 @@ Class {
 		'shape',
 		'labelShape'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSLineADFeedback.class.st b/repository/OpenPonk-Roassal/OPRSLineADFeedback.class.st
similarity index 94%
rename from repository/OpenPonk-Roassal3/OPRSLineADFeedback.class.st
rename to repository/OpenPonk-Roassal/OPRSLineADFeedback.class.st
index ce11d21e..ced0243c 100644
--- a/repository/OpenPonk-Roassal3/OPRSLineADFeedback.class.st
+++ b/repository/OpenPonk-Roassal/OPRSLineADFeedback.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSLineADFeedback,
 	#superclass : #OPRSAcceptDenyFeedbackBuilder,
-	#category : #'OpenPonk-Roassal3-CreationFeedback'
+	#category : #'OpenPonk-Roassal-CreationFeedback'
 }
 
 { #category : #private }
diff --git a/repository/OpenPonk-Roassal3/OPRSMarkerBuilder.class.st b/repository/OpenPonk-Roassal/OPRSMarkerBuilder.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSMarkerBuilder.class.st
rename to repository/OpenPonk-Roassal/OPRSMarkerBuilder.class.st
index a6a9445e..72995788 100644
--- a/repository/OpenPonk-Roassal3/OPRSMarkerBuilder.class.st
+++ b/repository/OpenPonk-Roassal/OPRSMarkerBuilder.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSMarkerBuilder,
 	#superclass : #Object,
-	#category : #'OpenPonk-Roassal3-Markers'
+	#category : #'OpenPonk-Roassal-Markers'
 }
 
 { #category : #shapes }
diff --git a/repository/OpenPonk-Roassal3/OPRSNoInteraction.class.st b/repository/OpenPonk-Roassal/OPRSNoInteraction.class.st
similarity index 76%
rename from repository/OpenPonk-Roassal3/OPRSNoInteraction.class.st
rename to repository/OpenPonk-Roassal/OPRSNoInteraction.class.st
index f405c5e6..1e2a221b 100644
--- a/repository/OpenPonk-Roassal3/OPRSNoInteraction.class.st
+++ b/repository/OpenPonk-Roassal/OPRSNoInteraction.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSNoInteraction,
 	#superclass : #RSInteraction,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #hooks }
diff --git a/repository/OpenPonk-Roassal3/OPRSNodeADFeedback.class.st b/repository/OpenPonk-Roassal/OPRSNodeADFeedback.class.st
similarity index 94%
rename from repository/OpenPonk-Roassal3/OPRSNodeADFeedback.class.st
rename to repository/OpenPonk-Roassal/OPRSNodeADFeedback.class.st
index 0032981f..f3dd45ca 100644
--- a/repository/OpenPonk-Roassal3/OPRSNodeADFeedback.class.st
+++ b/repository/OpenPonk-Roassal/OPRSNodeADFeedback.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSNodeADFeedback,
 	#superclass : #OPRSAcceptDenyFeedbackBuilder,
-	#category : #'OpenPonk-Roassal3-CreationFeedback'
+	#category : #'OpenPonk-Roassal-CreationFeedback'
 }
 
 { #category : #private }
diff --git a/repository/OpenPonk-Roassal3/OPRSOrthogonalBorderAttachPoint.class.st b/repository/OpenPonk-Roassal/OPRSOrthogonalBorderAttachPoint.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSOrthogonalBorderAttachPoint.class.st
rename to repository/OpenPonk-Roassal/OPRSOrthogonalBorderAttachPoint.class.st
index bf5ae95e..08ee26ab 100644
--- a/repository/OpenPonk-Roassal3/OPRSOrthogonalBorderAttachPoint.class.st
+++ b/repository/OpenPonk-Roassal/OPRSOrthogonalBorderAttachPoint.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSOrthogonalBorderAttachPoint,
 	#superclass : #RSBorderAttachPoint,
-	#category : #'OpenPonk-Roassal3-AttachPoints'
+	#category : #'OpenPonk-Roassal-AttachPoints'
 }
 
 { #category : #'public - hooks' }
diff --git a/repository/OpenPonk-Roassal3/OPRSPolyline.class.st b/repository/OpenPonk-Roassal/OPRSPolyline.class.st
similarity index 79%
rename from repository/OpenPonk-Roassal3/OPRSPolyline.class.st
rename to repository/OpenPonk-Roassal/OPRSPolyline.class.st
index 88c06f99..71949aef 100644
--- a/repository/OpenPonk-Roassal3/OPRSPolyline.class.st
+++ b/repository/OpenPonk-Roassal/OPRSPolyline.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSPolyline,
 	#superclass : #RSPolyline,
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRSRemoveable.class.st b/repository/OpenPonk-Roassal/OPRSRemoveable.class.st
similarity index 96%
rename from repository/OpenPonk-Roassal3/OPRSRemoveable.class.st
rename to repository/OpenPonk-Roassal/OPRSRemoveable.class.st
index 5aa7fac6..5b53ce06 100644
--- a/repository/OpenPonk-Roassal3/OPRSRemoveable.class.st
+++ b/repository/OpenPonk-Roassal/OPRSRemoveable.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSRemoveable,
 	#superclass : #RSAbstractControlCanvasInteraction,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #testing }
diff --git a/repository/OpenPonk-Roassal3/OPRSResizable.class.st b/repository/OpenPonk-Roassal/OPRSResizable.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSResizable.class.st
rename to repository/OpenPonk-Roassal/OPRSResizable.class.st
index 0f5acb74..ca72a3e6 100644
--- a/repository/OpenPonk-Roassal3/OPRSResizable.class.st
+++ b/repository/OpenPonk-Roassal/OPRSResizable.class.st
@@ -5,7 +5,7 @@ Class {
 		'shape',
 		'handles'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSResize.class.st b/repository/OpenPonk-Roassal/OPRSResize.class.st
similarity index 93%
rename from repository/OpenPonk-Roassal3/OPRSResize.class.st
rename to repository/OpenPonk-Roassal/OPRSResize.class.st
index a951ba89..11ff29b5 100644
--- a/repository/OpenPonk-Roassal3/OPRSResize.class.st
+++ b/repository/OpenPonk-Roassal/OPRSResize.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'oversize'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectable.class.st b/repository/OpenPonk-Roassal/OPRSSelectable.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSSelectable.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectable.class.st
index 1fca6f3b..6f2456e3 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectable.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectable.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSSelectable,
 	#superclass : #RSHighlightable,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectableCanvas.class.st b/repository/OpenPonk-Roassal/OPRSSelectableCanvas.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/OPRSSelectableCanvas.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectableCanvas.class.st
index 10f8fc70..8ea78b68 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectableCanvas.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectableCanvas.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'multiselectEnabled'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'event processing' }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggable.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggable.class.st
similarity index 99%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggable.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggable.class.st
index 33e85812..9e57cb00 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggable.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggable.class.st
@@ -8,7 +8,7 @@ Class {
 		'movedLinesWithControlPoints',
 		'alignmentLineShapes'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'instance creation' }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableBorder.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st
similarity index 99%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableBorder.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st
index 4dad084e..87ef2a41 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableBorder.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableBorder.class.st
@@ -8,7 +8,7 @@ Class {
 		'positionOfMainRelativeToDragBoxes',
 		'dragBoxWidth'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #hooks }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableContainedShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableContainedShapesProvider.class.st
similarity index 92%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableContainedShapesProvider.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableContainedShapesProvider.class.st
index 2ef0d369..8c608014 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableContainedShapesProvider.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableContainedShapesProvider.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSSelectionDraggableContainedShapesProvider,
 	#superclass : #OPRSSelectionDraggableInnerShapesProvider,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #asserting }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableCustomShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableCustomShapesProvider.class.st
similarity index 94%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableCustomShapesProvider.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableCustomShapesProvider.class.st
index a5834954..b226b74e 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableCustomShapesProvider.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableCustomShapesProvider.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'block'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'instance creation' }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableInnerShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableInnerShapesProvider.class.st
similarity index 82%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableInnerShapesProvider.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableInnerShapesProvider.class.st
index d2ee4126..8ad4b5d9 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableInnerShapesProvider.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableInnerShapesProvider.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSSelectionDraggableInnerShapesProvider,
 	#superclass : #Object,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #asserting }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableNoInnerShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableNoInnerShapesProvider.class.st
similarity index 84%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableNoInnerShapesProvider.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableNoInnerShapesProvider.class.st
index 5dddf00c..7dff5bc4 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableNoInnerShapesProvider.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableNoInnerShapesProvider.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSSelectionDraggableNoInnerShapesProvider,
 	#superclass : #OPRSSelectionDraggableInnerShapesProvider,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #asserting }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st b/repository/OpenPonk-Roassal/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st
similarity index 93%
rename from repository/OpenPonk-Roassal3/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st
index c35bdc13..367a1638 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSSelectionDraggableSmallerOverlappingShapesProvider,
 	#superclass : #OPRSSelectionDraggableInnerShapesProvider,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #asserting }
diff --git a/repository/OpenPonk-Roassal3/OPRSSelectionEndEvent.class.st b/repository/OpenPonk-Roassal/OPRSSelectionEndEvent.class.st
similarity index 87%
rename from repository/OpenPonk-Roassal3/OPRSSelectionEndEvent.class.st
rename to repository/OpenPonk-Roassal/OPRSSelectionEndEvent.class.st
index de3cf53b..8d79d335 100644
--- a/repository/OpenPonk-Roassal3/OPRSSelectionEndEvent.class.st
+++ b/repository/OpenPonk-Roassal/OPRSSelectionEndEvent.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'originalEvent'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRSZoomableCanvasInteraction.class.st b/repository/OpenPonk-Roassal/OPRSZoomableCanvasInteraction.class.st
similarity index 95%
rename from repository/OpenPonk-Roassal3/OPRSZoomableCanvasInteraction.class.st
rename to repository/OpenPonk-Roassal/OPRSZoomableCanvasInteraction.class.st
index b562194b..7c26111f 100644
--- a/repository/OpenPonk-Roassal3/OPRSZoomableCanvasInteraction.class.st
+++ b/repository/OpenPonk-Roassal/OPRSZoomableCanvasInteraction.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSZoomableCanvasInteraction,
 	#superclass : #RSZoomableCanvasInteraction,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #events }
diff --git a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentHorizontalLine.class.st b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentHorizontalLine.class.st
similarity index 90%
rename from repository/OpenPonk-Roassal3/OPRectangleDragAlignmentHorizontalLine.class.st
rename to repository/OpenPonk-Roassal/OPRectangleDragAlignmentHorizontalLine.class.st
index 911b855b..64e1502c 100644
--- a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentHorizontalLine.class.st
+++ b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentHorizontalLine.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRectangleDragAlignmentHorizontalLine,
 	#superclass : #OPRectangleDragAlignmentLine,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentLine.class.st b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentLine.class.st
similarity index 97%
rename from repository/OpenPonk-Roassal3/OPRectangleDragAlignmentLine.class.st
rename to repository/OpenPonk-Roassal/OPRectangleDragAlignmentLine.class.st
index 61b27969..7b89db75 100644
--- a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentLine.class.st
+++ b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentLine.class.st
@@ -5,7 +5,7 @@ Class {
 		'dragged',
 		'compared'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentVerticalLine.class.st b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentVerticalLine.class.st
similarity index 91%
rename from repository/OpenPonk-Roassal3/OPRectangleDragAlignmentVerticalLine.class.st
rename to repository/OpenPonk-Roassal/OPRectangleDragAlignmentVerticalLine.class.st
index df4d672e..a4a58968 100644
--- a/repository/OpenPonk-Roassal3/OPRectangleDragAlignmentVerticalLine.class.st
+++ b/repository/OpenPonk-Roassal/OPRectangleDragAlignmentVerticalLine.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRectangleDragAlignmentVerticalLine,
 	#superclass : #OPRectangleDragAlignmentLine,
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/repository/OpenPonk-Roassal3/Point.extension.st b/repository/OpenPonk-Roassal/Point.extension.st
similarity index 84%
rename from repository/OpenPonk-Roassal3/Point.extension.st
rename to repository/OpenPonk-Roassal/Point.extension.st
index bdfe01ef..b618e9fb 100644
--- a/repository/OpenPonk-Roassal3/Point.extension.st
+++ b/repository/OpenPonk-Roassal/Point.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Point }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Point >> closeTo: aPoint absolutePrecision: aPrecision [
 
 	^ (x closeTo: aPoint x absolutePrecision: aPrecision) and: [ 
diff --git a/repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st b/repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st
similarity index 95%
rename from repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st
rename to repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st
index 341302de..544f73ef 100644
--- a/repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st
+++ b/repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSAbstractControlCanvasInteraction }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSAbstractControlCanvasInteraction >> correctRectangle: rectangle camera: camera [
 
 	| visibleRectangle correctX correctY |
diff --git a/repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st b/repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st
similarity index 85%
rename from repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st
rename to repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st
index 6bc9cd83..2106b3bc 100644
--- a/repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st
+++ b/repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSAbstractControlPointsLine }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSAbstractControlPointsLine >> innerControlPoints: aCollection [
 
 	self controlPoints: { self controlPoints first } , aCollection
diff --git a/repository/OpenPonk-Roassal3/RSAbstractLine.extension.st b/repository/OpenPonk-Roassal/RSAbstractLine.extension.st
similarity index 75%
rename from repository/OpenPonk-Roassal3/RSAbstractLine.extension.st
rename to repository/OpenPonk-Roassal/RSAbstractLine.extension.st
index 4ba70231..7c9f37df 100644
--- a/repository/OpenPonk-Roassal3/RSAbstractLine.extension.st
+++ b/repository/OpenPonk-Roassal/RSAbstractLine.extension.st
@@ -1,12 +1,12 @@
 Extension { #name : #RSAbstractLine }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSAbstractLine >> innerControlPoints [
 
 	^ self controlPoints copyFrom: 2 to: self controlPoints size - 1
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSAbstractLine >> labels [
 
 	^ self propertyAt: #OPLabels ifAbsentPut: [ Dictionary new ]
diff --git a/repository/OpenPonk-Roassal3/RSAthensMorph.extension.st b/repository/OpenPonk-Roassal/RSAthensMorph.extension.st
similarity index 82%
rename from repository/OpenPonk-Roassal3/RSAthensMorph.extension.st
rename to repository/OpenPonk-Roassal/RSAthensMorph.extension.st
index 5e07770f..ef16564f 100644
--- a/repository/OpenPonk-Roassal3/RSAthensMorph.extension.st
+++ b/repository/OpenPonk-Roassal/RSAthensMorph.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSAthensMorph }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSAthensMorph >> resetShapeBeingDragged [
 
 	eventBeginingDragging ifNil: [ ^ self ].
diff --git a/repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st b/repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st
similarity index 98%
rename from repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st
rename to repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st
index dcf347d2..03fc267f 100644
--- a/repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st
+++ b/repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st
@@ -5,7 +5,7 @@ Class {
 		'shapesToUseBorderColor',
 		'borderColoredShapesColorBlock'
 	],
-	#category : #'OpenPonk-Roassal3-Markers'
+	#category : #'OpenPonk-Roassal-Markers'
 }
 
 { #category : #accessing }
diff --git a/repository/OpenPonk-Roassal3/RSBoundingShape.extension.st b/repository/OpenPonk-Roassal/RSBoundingShape.extension.st
similarity index 84%
rename from repository/OpenPonk-Roassal3/RSBoundingShape.extension.st
rename to repository/OpenPonk-Roassal/RSBoundingShape.extension.st
index b5447d37..65e2c456 100644
--- a/repository/OpenPonk-Roassal3/RSBoundingShape.extension.st
+++ b/repository/OpenPonk-Roassal/RSBoundingShape.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSBoundingShape }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSBoundingShape >> element [
 
 	self
@@ -9,7 +9,7 @@ RSBoundingShape >> element [
 	^ self
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSBoundingShape >> elementOn: aModel [
 
 	self
diff --git a/repository/OpenPonk-Roassal3/RSCanvas.extension.st b/repository/OpenPonk-Roassal/RSCanvas.extension.st
similarity index 82%
rename from repository/OpenPonk-Roassal3/RSCanvas.extension.st
rename to repository/OpenPonk-Roassal/RSCanvas.extension.st
index 9a52deb7..cd30234f 100644
--- a/repository/OpenPonk-Roassal3/RSCanvas.extension.st
+++ b/repository/OpenPonk-Roassal/RSCanvas.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSCanvas }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSCanvas >> elements [
 
 	self
@@ -9,13 +9,13 @@ RSCanvas >> elements [
 	^ self nodes
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSCanvas >> isSelectable [
 
 	^ false
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSCanvas >> shapesWithActionForPosition: aPositionInSpace [
 
 	| result |
diff --git a/repository/OpenPonk-Roassal3/RSComposite.extension.st b/repository/OpenPonk-Roassal/RSComposite.extension.st
similarity index 83%
rename from repository/OpenPonk-Roassal3/RSComposite.extension.st
rename to repository/OpenPonk-Roassal/RSComposite.extension.st
index 4f5c24b1..97e5dc7e 100644
--- a/repository/OpenPonk-Roassal3/RSComposite.extension.st
+++ b/repository/OpenPonk-Roassal/RSComposite.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSComposite }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSComposite >> isOrComposesOf: aShape [
 
 	^ (super isOrComposesOf: aShape) or: [ 
diff --git a/repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st b/repository/OpenPonk-Roassal/RSControlConfiguration.extension.st
similarity index 68%
rename from repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st
rename to repository/OpenPonk-Roassal/RSControlConfiguration.extension.st
index f258aabd..476827d0 100644
--- a/repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st
+++ b/repository/OpenPonk-Roassal/RSControlConfiguration.extension.st
@@ -1,12 +1,12 @@
 Extension { #name : #RSControlConfiguration }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSControlConfiguration >> hasZoomableAnimation [
 
 	^ true
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSControlConfiguration >> keepCameraOnContent [
 
 	^ true
diff --git a/repository/OpenPonk-Roassal3/RSEvent.extension.st b/repository/OpenPonk-Roassal/RSEvent.extension.st
similarity index 80%
rename from repository/OpenPonk-Roassal3/RSEvent.extension.st
rename to repository/OpenPonk-Roassal/RSEvent.extension.st
index 16f2393b..e1ade092 100644
--- a/repository/OpenPonk-Roassal3/RSEvent.extension.st
+++ b/repository/OpenPonk-Roassal/RSEvent.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSEvent }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSEvent >> element [
 
 	self
@@ -9,7 +9,7 @@ RSEvent >> element [
 	^ self shape
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSEvent >> view [
 
 	self
diff --git a/repository/OpenPonk-Roassal3/RSMarker.extension.st b/repository/OpenPonk-Roassal/RSMarker.extension.st
similarity index 84%
rename from repository/OpenPonk-Roassal3/RSMarker.extension.st
rename to repository/OpenPonk-Roassal/RSMarker.extension.st
index c4d50841..fe526901 100644
--- a/repository/OpenPonk-Roassal3/RSMarker.extension.st
+++ b/repository/OpenPonk-Roassal/RSMarker.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #RSMarker }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSMarker >> asEmptyMarker [
 
 	self shape color: Color white.
diff --git a/repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st b/repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st
similarity index 73%
rename from repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st
rename to repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st
index 309f6ce4..c6ee3f94 100644
--- a/repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st
+++ b/repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st
@@ -1,12 +1,12 @@
 Extension { #name : #RSObjectWithProperty }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSObjectWithProperty >> isOrComposesOf: aShape [
 
 	^ self = aShape
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSObjectWithProperty >> isSelectionDraggable [
 
 	^ self hasProperty: OPRSSelectionDraggable
diff --git a/repository/OpenPonk-Roassal3/RSShape.extension.st b/repository/OpenPonk-Roassal/RSShape.extension.st
similarity index 79%
rename from repository/OpenPonk-Roassal3/RSShape.extension.st
rename to repository/OpenPonk-Roassal/RSShape.extension.st
index 88c6423c..c8f9123a 100644
--- a/repository/OpenPonk-Roassal3/RSShape.extension.st
+++ b/repository/OpenPonk-Roassal/RSShape.extension.st
@@ -1,12 +1,12 @@
 Extension { #name : #RSShape }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSShape >> asEmptyMarker [
 
 	^ self asMarker asEmptyMarker
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSShape >> isElement [
 
 	self
@@ -15,13 +15,13 @@ RSShape >> isElement [
 	^ self isNode
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSShape >> isSelectable [
 
 	^ self hasProperty: OPRSSelectable
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSShape >> isSelected [
 
 	^ self canvas
@@ -30,7 +30,7 @@ RSShape >> isSelected [
 		  currentCanvas selectedShapes includes: self ]
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSShape >> shapeWithActionForPosition: position [
 
 	self canvas
@@ -42,7 +42,7 @@ RSShape >> shapeWithActionForPosition: position [
 		  ifFalse: [ nil ]
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 RSShape >> view [
 
 	self
diff --git a/repository/OpenPonk-Roassal3/Rectangle.extension.st b/repository/OpenPonk-Roassal/Rectangle.extension.st
similarity index 91%
rename from repository/OpenPonk-Roassal3/Rectangle.extension.st
rename to repository/OpenPonk-Roassal/Rectangle.extension.st
index a462a7af..8604cf23 100644
--- a/repository/OpenPonk-Roassal3/Rectangle.extension.st
+++ b/repository/OpenPonk-Roassal/Rectangle.extension.st
@@ -1,18 +1,18 @@
 Extension { #name : #Rectangle }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> floatCenterX [
 
 	^ origin x + corner x / 2.0
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> floatCenterY [
 
 	^ origin y + corner y / 2.0
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> horizontalAlignmentLinesTo: otherRectangle margin: margin [
 
 	^ self
@@ -21,7 +21,7 @@ Rectangle >> horizontalAlignmentLinesTo: otherRectangle margin: margin [
 		  in: margin
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> possibleHorizontalAlignmentLinesTo: otherRectangle [
 
 	^ Array
@@ -44,7 +44,7 @@ Rectangle >> possibleHorizontalAlignmentLinesTo: otherRectangle [
 				   comparedSecond: otherRectangle bottomRight)
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> possibleVerticalAlignmentLinesTo: otherRectangle [
 
 	^ Array
@@ -66,7 +66,7 @@ Rectangle >> possibleVerticalAlignmentLinesTo: otherRectangle [
 				   comparedSecond: otherRectangle bottomRight)
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> selectAlignmentLinesFrom: alignmentLines in: margin [
 
 	| best |
@@ -85,7 +85,7 @@ Rectangle >> selectAlignmentLinesFrom: alignmentLines in: margin [
 	^ best
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Rectangle >> verticalAlignmentLinesTo: otherRectangle margin: margin [
 
 	^ self
diff --git a/repository/OpenPonk-Roassal/package.st b/repository/OpenPonk-Roassal/package.st
new file mode 100644
index 00000000..5155cf64
--- /dev/null
+++ b/repository/OpenPonk-Roassal/package.st
@@ -0,0 +1 @@
+Package { #name : #'OpenPonk-Roassal' }
diff --git a/repository/OpenPonk-Roassal3/package.st b/repository/OpenPonk-Roassal3/package.st
deleted file mode 100644
index 1effae7b..00000000
--- a/repository/OpenPonk-Roassal3/package.st
+++ /dev/null
@@ -1 +0,0 @@
-Package { #name : #'OpenPonk-Roassal3' }