diff --git a/Iceberg-TipUI/IceMergeResolutionRequest.extension.st b/Iceberg-TipUI/IceMergeResolutionRequest.extension.st
new file mode 100644
index 0000000000..e0adfb1bec
--- /dev/null
+++ b/Iceberg-TipUI/IceMergeResolutionRequest.extension.st
@@ -0,0 +1,19 @@
+Extension { #name : 'IceMergeResolutionRequest' }
+
+{ #category : '*Iceberg-TipUI' }
+IceMergeResolutionRequest >> defaultAction [
+
+	| window mergeMorph |
+	mergeMorph := (IceTipMergeMorph forMerger: merge).
+
+	mergeMorph
+		fromDescription: merge sourceDescription;
+		toDescription: merge targetDescription.
+
+	window := mergeMorph newWindow
+		title: 'Merge';
+		yourself.
+
+	window openModal.
+	^ mergeMorph merged
+]
diff --git a/Iceberg-TipUI/IceExperimentalFeature.class.st b/Iceberg/IceExperimentalFeature.class.st
similarity index 80%
rename from Iceberg-TipUI/IceExperimentalFeature.class.st
rename to Iceberg/IceExperimentalFeature.class.st
index db10719754..3463788ff4 100644
--- a/Iceberg-TipUI/IceExperimentalFeature.class.st
+++ b/Iceberg/IceExperimentalFeature.class.st
@@ -6,9 +6,9 @@ This is useful to guarantee the correct keeping of the changes.
 Class {
 	#name : 'IceExperimentalFeature',
 	#superclass : 'IceWarning',
-	#category : 'Iceberg-TipUI-Exceptions',
-	#package : 'Iceberg-TipUI',
-	#tag : 'Exceptions'
+	#category : 'Iceberg-Errors',
+	#package : 'Iceberg',
+	#tag : 'Errors'
 }
 
 { #category : 'visiting' }
diff --git a/Iceberg/IceMergeResolutionRequest.class.st b/Iceberg/IceMergeResolutionRequest.class.st
index 6ec4dbca7d..24fc1cc3cf 100644
--- a/Iceberg/IceMergeResolutionRequest.class.st
+++ b/Iceberg/IceMergeResolutionRequest.class.st
@@ -9,24 +9,6 @@ Class {
 	#tag : 'Errors'
 }
 
-{ #category : 'exception description' }
-IceMergeResolutionRequest >> defaultAction [
-
-	| window mergeMorph |
-	mergeMorph := (IceTipMergeMorph forMerger: merge).
-
-	mergeMorph
-		fromDescription: merge sourceDescription;
-		toDescription: merge targetDescription.
-
-	window := mergeMorph newWindow
-		title: 'Merge';
-		yourself.
-
-	window openModal.
-	^ mergeMorph merged
-]
-
 { #category : 'accessing' }
 IceMergeResolutionRequest >> merge [
 	^ merge
diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st
index e3ee53dc4c..e7257b660a 100644
--- a/Iceberg/IceMetacelloRepositoryAdapter.class.st
+++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st
@@ -124,24 +124,6 @@ IceMetacelloRepositoryAdapter >> loadPackageNamed: aName intoLoader: aLoader [
 		  self }
 ]
 
-{ #category : 'MonticelloGUI' }
-IceMetacelloRepositoryAdapter >> morphicOpen: workingCopy [
-
-	| shouldOpenIceberg |
-	shouldOpenIceberg := 
-		SpApplication defaultApplication newConfirm
-			title: 'Browsing an iceberg repository';
-			label:  ('{1} belongs to {2} and cannot be browsed here. 
-Do you want to open the Iceberg Browser instead?' format: {
-					                      workingCopy packageName.
-					                      self repository name });
-			acceptLabel: 'Open';
-			cancelLabel: 'Cancel';
-		   openModal.
-	shouldOpenIceberg ifFalse: [ ^ self ].
-	IceTipRepositoriesBrowser new open
-]
-
 { #category : 'accessing' }
 IceMetacelloRepositoryAdapter >> packageNamed: aName [
 
diff --git a/Iceberg-TipUI/IceWarning.class.st b/Iceberg/IceWarning.class.st
similarity index 52%
rename from Iceberg-TipUI/IceWarning.class.st
rename to Iceberg/IceWarning.class.st
index 9b64da1319..410add97d3 100644
--- a/Iceberg-TipUI/IceWarning.class.st
+++ b/Iceberg/IceWarning.class.st
@@ -1,12 +1,12 @@
 "
-I'm a general warning in the context of iceberg UI.
+I'm a general warning in the context of iceberg.
 "
 Class {
 	#name : 'IceWarning',
 	#superclass : 'Warning',
-	#category : 'Iceberg-TipUI-Exceptions',
-	#package : 'Iceberg-TipUI',
-	#tag : 'Exceptions'
+	#category : 'Iceberg-Errors',
+	#package : 'Iceberg',
+	#tag : 'Errors'
 }
 
 { #category : 'visiting' }
diff --git a/scripts/preLoading.st b/scripts/preLoading.st
index 24bbae3ca5..a070bdebc0 100644
--- a/scripts/preLoading.st
+++ b/scripts/preLoading.st
@@ -17,7 +17,7 @@ Otherwise obsolete instances will stay".
 MCWorkingCopy registry becomeForward: (MCWorkingCopy registry select: [ :each | each packageName = 'MonticelloMocks' ]).
 
 "Remove iceberg from system (so I can reload it)"
-MetacelloPharoPlatform select.
+MetacelloPlatform select.
 
 #(
 	'Calypso-SystemPlugins-Monticello-Browser'