diff --git a/src/NewTools-ChangeSorter/ChangeSorterModel.class.st b/src/NewTools-ChangeSorter/ChangeSorterModel.class.st
deleted file mode 100644
index 38aff060c..000000000
--- a/src/NewTools-ChangeSorter/ChangeSorterModel.class.st
+++ /dev/null
@@ -1,319 +0,0 @@
-"
-A ChangeSorterModel is a model used by Change Sorter UIs for computation
-"
-Class {
-	#name : 'ChangeSorterModel',
-	#superclass : 'Model',
-	#classVars : [
-		'ClassDescriptionsMap'
-	],
-	#category : 'NewTools-ChangeSorter',
-	#package : 'NewTools-ChangeSorter'
-}
-
-{ #category : 'accessing' }
-ChangeSorterModel class >> classDescriptionsMap [
-	^ ClassDescriptionsMap
-]
-
-{ #category : 'accessing' }
-ChangeSorterModel class >> classDescriptionsMap: anObject [
-	ClassDescriptionsMap := anObject
-]
-
-{ #category : 'defaults' }
-ChangeSorterModel class >> defaultClassDescriptionsMap [
-	^ Dictionary new
-		at: #remove put: 'Entire class was removed.';
-		at: #addedThenRemoved put: 'Class was added then removed.';
-		at: #rename put: 'Class name was changed.';
-		at: #add put: 'Class definition was added.';
-		at: #change put: 'Class definition was changed.';
-		at: #reorganize put: 'Class organization was changed.';
-		at: #comment put: 'New class comment.';
-		yourself
-]
-
-{ #category : 'class initialization' }
-ChangeSorterModel class >> initialize [
-	self classDescriptionsMap: self defaultClassDescriptionsMap
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> addPreambleTo: aChangeSet [
-
-	aChangeSet assurePreambleExists
-]
-
-{ #category : 'environment' }
-ChangeSorterModel >> allChanges [
-
-	^ ChangeSet allChangeSets reverse
-]
-
-{ #category : 'method' }
-ChangeSorterModel >> browseVersionsFrom: aMethod [
-	"Create and schedule a Versions Browser, showing all versions of the
-	currently selected message. Answer the browser or nil."
-
-	aMethod selector
-		ifNil: [ self inform: 'Sorry, only actual methods have retrievable versions.'. ^nil ]
-		ifNotNil: [:selector |
-			Smalltalk tools versionBrowser browseVersionsForMethod: aMethod ]
-]
-
-{ #category : 'text' }
-ChangeSorterModel >> buildChangeSetDescriptionFor: changeSet [
-		
-	^ changeSet
-		ifNil: [ '' ] 
-		ifNotNil: [ changeSet preambleString ifNil: ['']]
-]
-
-{ #category : 'text' }
-ChangeSorterModel >> buildClassDescriptionFor: changeSet class: class [
-	^ String streamContents: [ :stream |
-			(changeSet classChangeAt: class name)
-				do: [ :each | stream nextPutAll: (self classDescriptionsMap at: each) ]
-				separatedBy: [ stream cr ] ]
-]
-
-{ #category : 'text' }
-ChangeSorterModel >> buildSelectorDescriptionFor: changeSet class: class selector: selector [
-
-	| changeType code |
-	changeType := changeSet atSelector: selector class: class.
-	
-	changeType == #remove
-		ifTrue: [^ 'Method has been removed (see versions)'].
-	changeType == #addedThenRemoved
-		ifTrue: [^ 'Added then removed (see versions)']. 
-	class
-		ifNil: [^ 'Method was added, but cannot be found!'].
-	(class includesSelector: selector)
-		ifFalse: [^ 'Method was added, but cannot be found!'].
-	code := class sourceCodeAt: selector.
-		
-	^ code asText
-]
-
-{ #category : 'accessing' }
-ChangeSorterModel >> classDescriptionsMap [
-
-	^ self class classDescriptionsMap
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> copyAllChangesFrom: source to: destination [
-
-	destination assimilateAllChangesFoundIn: source
-]
-
-{ #category : 'class' }
-ChangeSorterModel >> copyClass: aClass from: source to: destination [
-
-	destination absorbClass: aClass name from: source.
-]
-
-{ #category : 'message' }
-ChangeSorterModel >> copySelector: selector inClass: class from: source to: destination [
-
-	destination
-		absorbMethod: selector 
-		class: class 
-		from:source
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> createNewSet [
-
-	^ ChangeSet newChangeSet
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> currentChangeSet [
-
-	^ ChangeSet current 
-]
-
-{ #category : 'class' }
-ChangeSorterModel >> fileOutClass: aClass from: aChangeSet [
-	"this is a hack!! makes a new change set, called the class name, adds author initials to try to make a unique change set name, files it out and removes it. kfr 16 june 2000"
-	"Method copied from ChangeSorter"
-	
-	| aSet |
-      aSet := ChangeSet newChangeSet: aClass name.
-	aSet ifNil:[ ^self ].
-	aSet absorbClass: aClass name from: aChangeSet.
-	aSet fileOut.
-	ChangeSet removeChangeSet: aSet.
-]
-
-{ #category : 'message' }
-ChangeSorterModel >> fileOutSelector: selector from: aClass [
-	
-	aClass fileOutMethod: selector
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> findChangeSetIn: aCollectionOfChangeSets [
-	"Search for a changeSet by name.  Pop up a menu of all changeSets whose name contains the string entered by the user.  If only one matches, then the pop-up menu is bypassed"
-	| index pattern candidates nameList |
-
-	self okToChange ifFalse: [^ self].
-	pattern := UIManager default request: 'ChangeSet name or fragment?'.
-	pattern isEmptyOrNil ifTrue: [^ self].
-	nameList := aCollectionOfChangeSets collect: [ : each | each name ].
-	candidates := aCollectionOfChangeSets select:
-			[:c | (nameList includes: c name) and: 
-				[c name includesSubstring: pattern caseSensitive: false]].
-	candidates size = 0 ifTrue: [ ^ self inform: 'No matching change sets.' ].
-	candidates size = 1 ifTrue: [ ^ candidates first ].
-	index := UIManager default chooseFrom: (candidates collect: [:each | each name]).
-	index = 0 ifFalse: [ ^ (candidates at: index) ].
-]
-
-{ #category : 'message' }
-ChangeSorterModel >> forgetSelector: selector inClass: aClass fromChangeSet: aChangeSet [
-
-	aChangeSet
-			removeSelectorChanges: selector 
-			class: aClass
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> removeChangeSet: aChangeSet prompting: doPrompt [
-	"Completely destroy my change set.  Check if it's OK first, and if doPrompt is true, get the user to confirm his intentions first."
-
-	| message aName msg |
-	aName := aChangeSet name.
-	aChangeSet okayToRemove ifFalse: [^ self]. "forms current changes for some project"
-	(aChangeSet isEmpty or: [doPrompt not]) ifFalse:
-		[message := 'Are you certain that you want to 
-remove (destroy) the change set
-named  "', aName, '" ?'.
-		(self confirm: message) ifFalse: [^ self]].
-
-	doPrompt ifTrue:
-		[msg := aChangeSet hasPreamble
-			ifTrue:
-				[aChangeSet hasPostscript
-					ifTrue:
-						['a preamble and a postscript']
-					ifFalse:
-						['a preamble']]
-			ifFalse:
-				[aChangeSet hasPostscript
-					ifTrue:
-						['a postscript']
-					ifFalse:
-						['']].
-		msg isEmpty ifFalse:
-			[(self confirm: 
-'Caution!  This change set has
-', msg, ' which will be
-lost if you destroy the change set.
-Do you really want to go ahead with this?') ifFalse: [^ self]]].
-
-	"Go ahead and remove the change set"
-	ChangeSet removeChangeSet: aChangeSet.
-]
-
-{ #category : 'class' }
-ChangeSorterModel >> removeClass: class from: changeSet [
-
-	changeSet removeClassChanges: class.
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> removePostscriptFrom: aChange [
-
-	(aChange hasPostscript and: [ aChange postscriptHasDependents ]) ifTrue:
-		[^ self inform:
-'Cannot remove the postscript right
-now because there is at least one
-window open on that postscript.
-Close that window and try again.'].
-
-	aChange removePostscript
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> rename: aChangeSet [
-	"Store a new name string into the selected ChangeSet.  reject duplicate name; allow user to back out"
-
-	| newName |
-	newName := UIManager default request: 'New name for this change set'
-						initialAnswer: aChangeSet name.
-						
-	(newName = aChangeSet name or: [newName isEmptyOrNil]) ifTrue:
-			[ ^ UIManager default inform: 'Please give a new name' ].
-
-	(ChangeSet named: newName) ifNotNil:
-			[ ^ UIManager default inform: 'Sorry that name is already used' ].
-
-	aChangeSet name: newName.
-	^ aChangeSet
-]
-
-{ #category : 'text' }
-ChangeSorterModel >> setContentsOfChangeSet: changeSet forClass: class andSelector: selector [
-	"return the source code that shows in the bottom pane"
-
-	class
-		ifNil: [
-			"Only the change set is currently selected"
-			^ self buildChangeSetDescriptionFor: changeSet ].
-	^ selector 
-		ifNil: [ 
-			"class is selected but not the selector"
-			self buildClassDescriptionFor: changeSet class: class ]
-		ifNotNil: [
-			"a class and a selector are selected"
-			self buildSelectorDescriptionFor: changeSet class: class selector: selector ]
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> setCurrentChangeSet: aChangeSet [
-
-	ChangeSet newChanges: aChangeSet
-	
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> submerge: source into: destination [
-	"Copy the contents of the receiver to the other side, then remove the receiver -- all after checking that all is well."
-	|   message |
-	source == destination
-		ifTrue: [ ^ false ].
-	source isEmpty
-		ifTrue: [ 
-			self inform: 'Nothing to copy.  To remove,
-simply choose "remove".'.
-			^ false ].
-
-	source okayToRemove ifFalse: [^ false].
-	message := 'Please confirm:  copy all changes
-in "', source name, '" into "', destination name, '"
-and then destroy the change set
-named "', source name, '"?'.
- 
-	(self confirm: message) ifFalse: [^ false].
-
-	(source hasPreamble or: [source hasPostscript]) ifTrue:
-		[(self confirm: 
-'Caution!  This change set has a preamble or
-a postscript or both.  If you submerge it into
-the other side, these will be lost.
-Do you really want to go ahead with this?') ifFalse: [^ false]].
-
-	self copyAllChangesFrom: source to: destination.
-	self removeChangeSet: source prompting: false.
-	^ true
-]
-
-{ #category : 'change set' }
-ChangeSorterModel >> subtractFrom: source to: destination [
-
-	source forgetAllChangesFoundIn: destination
-]
diff --git a/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st b/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st
deleted file mode 100644
index c6ea141cc..000000000
--- a/src/NewTools-ChangeSorter/SpChangeSorterPresenter.class.st
+++ /dev/null
@@ -1,828 +0,0 @@
-"
-A change sorter is a little tool to manage changes. 
-Developer can give name to change containers and all the change made during this container is active are collected in the container. 
-The DualChangeSorter tool supports manipulation of changes between containers and fileout of the changes.
-
-ChangeSorterPresenter new openWithSpec
-"
-Class {
-	#name : 'SpChangeSorterPresenter',
-	#superclass : 'StPresenter',
-	#instVars : [
-		'model',
-		'changesListPresenter',
-		'methodsListPresenter',
-		'classesListPresenter',
-		'textPresenter'
-	],
-	#category : 'NewTools-ChangeSorter',
-	#package : 'NewTools-ChangeSorter'
-}
-
-{ #category : 'layout' }
-SpChangeSorterPresenter class >> defaultLayout [
-	
-	^ SpPanedLayout newTopToBottom
-		positionOfSlider: 35 percent;
-		add: (SpPanedLayout newLeftToRight
-			add: #changesListPresenter;
-			add: #classesListPresenter;
-			yourself);
-		add: (SpPanedLayout newTopToBottom
-			add: #methodsListPresenter;
-			add: #textPresenter;
-			yourself);
-		yourself
-]
-
-{ #category : 'opening' }
-SpChangeSorterPresenter class >> open [
-	<script>
-	
-	self new open
-]
-
-{ #category : 'accessing' }
-SpChangeSorterPresenter class >> title [
-	^ 'Change sorter'
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> addPreamble [
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self model addPreambleTo: self selectedChangeSet.
-	changesListPresenter selectItem: self selectedChangeSet
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> browseChangeSet [
-	"Open a message list browser on methods in the current change set"
-
-	| messages |
-	self selectedChangeSet ifNil: [
-		^ self inform: 'No change set selected' ].
-	messages := self selectedChangeSet changedMessageList select: [ :each |
-		            each isValid ].
-	self application tools messageList
-		browse: messages
-		title: 'Methods in Change Set ' , self selectedChangeSet name
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> browseImplementorsOfMessages [
-	SystemNavigation new browseAllImplementorsOf: self selectedSelector
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> browseMethodFull [
-	"Create and schedule a full Browser and then select the current class and message."
-
-	self selectedClass ifNotNil:
-		[:myClass | self application tools browser openOnClass: myClass selector: self selectedSelector ]
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> browseSendersOfMessages [
-
-	self systemNavigation browseAllSendersOf: self selectedSelector
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> browseVersions [
-	"Create and schedule a changelist browser on the versions of the 
-	selected message."
-	
-	self selectedClass ifNotNil: [:class |
-		self selectedSelector ifNotNil: [:selector || method |
-			method := self createRingMethodForSelector: selector inClass: class.
-			self model browseVersionsFrom: method ]]
-]
-
-{ #category : 'menu' }
-SpChangeSorterPresenter >> changeSetMenu [
-	"Set up aMenu to hold commands for the change-set-list pane.  This could be for a single or double changeSorter"
-
-	^ self newMenu
-		title: 'Change Set';
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Make changes go to me';
-						shortcut: $m meta;
-						action: [ self setCurrentChangeSet ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'New change set...';
-						shortcut: $n meta;
-						action: [ self newSet ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Find...';
-						shortcut: $f meta;
-						action: [ self findChangeSet ] ] ];
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Rename change set';
-						shortcut: $r meta;
-						action: [ self rename ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'File out';
-						shortcut: $o meta;
-						action: [ self fileOut ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Browse methods';
-						shortcut: $b meta;
-						action: [ self browseChangeSet ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Browse change set';
-						shortcut: $B meta;
-						action: [ self openChangeSetBrowser ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Add/Edit preamble';
-						shortcut: $p meta;
-						action: [ self addPreamble ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Remove preamble';
-						action: [ self removePreamble ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Add/Edit postscript...';
-						action: [ self editPostscript ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Remove postscript';
-						action: [ self removePostscript ] ] ];
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Destroy change set';
-						shortcut: $x meta;
-						action: [ self remove ] ] ];
-		yourself
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> changeSets [
-
-	^ self changesListPresenter listItems
-]
-
-{ #category : 'accessing' }
-SpChangeSorterPresenter >> changesListPresenter [
-
-	^ changesListPresenter
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> changesMenu: aBlock [
-	changesListPresenter contextMenu: aBlock
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> changesPresenterOn: aShortcut do: aBlock [
-
-	changesListPresenter bindKeyCombination: aShortcut toAction: aBlock
-]
-
-{ #category : 'menu' }
-SpChangeSorterPresenter >> classMenu [
-	"Fill aMenu with items appropriate for the class list"
-
-	^ self newMenu
-		title: 'Class list';
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Delete class from change set';
-						shortcut: $d meta;
-						action: [ self forgetClass ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Remove class from system';
-						shortcut: $x meta;
-						action: [ self removeClass ] ] ];
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Browse full';
-						shortcut: $b meta;
-						action: [ self browseMethodFull ] ] ];
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'FileOut';
-						action: [ self fileOutClass ] ] ];
-		yourself
-]
-
-{ #category : 'shortcuts' }
-SpChangeSorterPresenter >> classShortcuts: event from: aMorph [
-
-	self selectedClass ifNotNil: [ 
-		event keyString = '<Cmd-b>' ifTrue: [ ^ self browseMethodFull ].
-		event keyString = '<Cmd-d>' ifTrue: [ ^ self forgetClass ].
-		event keyString = '<Cmd-x>' ifTrue: [ ^ self removeClass ] ]
-]
-
-{ #category : 'accessing' }
-SpChangeSorterPresenter >> classesListPresenter [
-
-	^ classesListPresenter
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> classesMenu: aBlock [
-
-	classesListPresenter contextMenu: aBlock
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> classesOn: aShortcut do: aBlock [
-
-	classesListPresenter bindKeyCombination: aShortcut toAction: aBlock
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> connectPresenters [
-
-	self
-		registerChangeActions;
-		registerClassActions;
-		registerSelectorActions.
-
-	changesListPresenter items
-		ifNotEmpty: [ changesListPresenter selectIndex: 1 ]
-]
-
-{ #category : 'private' }
-SpChangeSorterPresenter >> createRingMethodForRemovedSelector: aSelector inClass: aClass [
-	"Create RingMethod from the	removealinfo"
-
-	| removalInfo method |
-	method := RGMethodDefinition class: aClass selector: aSelector.
-	removalInfo := (self selectedChangeSet changeRecorderFor: aClass) methodChanges at: aSelector ifAbsent: [ ^ method ].
-	method sourcePointer: removalInfo methodInfoFromRemoval first.
-	^ method
-]
-
-{ #category : 'private' }
-SpChangeSorterPresenter >> createRingMethodForSelector: aSelector inClass: aClass [
-	"Create RingMethod from the class compiledMethod or if it was removed from the removalinfo"
-	
-	(aClass includesSelector: aSelector) ifTrue:[ ^ aClass compiledMethodAt: aSelector].
-	^ self createRingMethodForRemovedSelector: aSelector inClass: aClass.
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> currentText [
-
-	 ^ textPresenter getText
-]
-
-{ #category : 'private' }
-SpChangeSorterPresenter >> defaultTitle [
-	
-	^ 'Change Sorter'
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> editPostscript [
-
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self selectedChangeSet editPostscript
-]
-
-{ #category : 'shortcuts' }
-SpChangeSorterPresenter >> ensureKeyBindingsFor: aWidget [
-
-	super ensureKeyBindingsFor: aWidget.
-	
-	self 
-		registerChangeSetShortcuts: changesListPresenter;
-		registerClassShortcuts: classesListPresenter;
-		registerMethodShortcuts: methodsListPresenter
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> fileOut [
-
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self selectedChangeSet fileOut
-]
-
-{ #category : 'menu - class' }
-SpChangeSorterPresenter >> fileOutClass [
-
-	self model fileOutClass: self selectedClass from: self selectedChangeSet
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> fileOutMessage [
-	"Put a description of the selected message on a file"
-
-	self selectedSelector ifNotNil: [:selector |
-		Cursor write showWhile:
-			[ self model fileOutSelector: selector from: self selectedClass ]]
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> findChangeSet [
-
-	| set |
-	set := self model findChangeSetIn: self changeSets.
-	changesListPresenter selectItem: set
-]
-
-{ #category : 'private' }
-SpChangeSorterPresenter >> forceChangesListRefresh [
-
-	| sel |	
-	sel := self selectedChangeSet.
-	changesListPresenter items: self model allChanges.
-	changesListPresenter selectItem: sel
-]
-
-{ #category : 'menu - class' }
-SpChangeSorterPresenter >> forgetClass [
-	"Remove all mention of this class from the changeSet"
-
-	self okToChange ifFalse: [^ self].
-	self selectedClass ifNotNil: [:class |
-		self model removeClass: class from: self selectedChangeSet.
-		self setSelectedChangeSet: self selectedChangeSet ]
-
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> forgetMessage [
-
-	self okToChange ifFalse: [^ self].
-	self selectedSelector ifNotNil: [:selector | 
-		self model 
-			forgetSelector: selector 
-			inClass: self selectedClass 
-			fromChangeSet: self selectedChangeSet.
-		self updateClassesList.
-		self setSelectedClassIndex: self selectedClassIndex ]
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> initialize [
-
-	model := ChangeSorterModel new.
-	super initialize.
-	SystemAnnouncer uniqueInstance weak
-		when: CurrentChangeSetChanged
-		send: #updateTitle
-		to: self.
-	self initializeAnnouncements
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> initializeAnnouncements [
-
-	SystemAnnouncer uniqueInstance weak
-		when: ClassAdded , ClassCommented , ClassRepackaged , ClassModifiedClassDefinition , ClassRemoved , ClassRenamed , MethodAdded , MethodModified , MethodRecategorized , MethodRemoved , ProtocolAnnouncement
-		send: #updateClassesList
-		to: self
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> initializePresenters [
-
-	methodsListPresenter := self newList.
-	classesListPresenter := self newList.
-	changesListPresenter := self newList.
-	textPresenter := self newCode.
-	self setFocus.
-	methodsListPresenter contextMenu: self messageMenu.
-	changesListPresenter contextMenu: self changeSetMenu.
-	classesListPresenter contextMenu: self classMenu.
-	methodsListPresenter matchSubstring.
-	classesListPresenter matchSubstring.
-	changesListPresenter matchSubstring.
-	changesListPresenter items: self model allChanges.
-	changesListPresenter display: [ :item | item name ].
-	classesListPresenter sortingBlock: [ :a :b | a name < b name ]
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> initializeWindow: aWindowPresenter [
-
-	aWindowPresenter
-		title: self title;
-		initialExtent: 500 @ 350
-]
-
-{ #category : 'menu' }
-SpChangeSorterPresenter >> messageMenu [
-	"Build a menu with items appropriate for the message list; could be for a single or double changeSorter"
-
-	^ self newMenu
-		title: 'Message list';
-		addGroup: [ :group | 
-			group
-				addItem: [ :anItem | 
-					anItem
-						name: 'Delete method from changeSet';
-						shortcut: $d meta;
-						action: [ self forgetMessage ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Remove method from system';
-						shortcut: $x meta;
-						action: [ self removeMessage ] ] ];
-		addGroup: [ :group | 
-			group
-				addItem: [ :anItem | 
-					anItem
-						name: 'Browse full';
-						shortcut: $b meta;
-						action: [ self browseMethodFull ] ] ];
-		addGroup: [ :group | 
-			group
-				addItem: [ :anItem | 
-					anItem
-						name: 'FileOut';
-						action: [ self fileOutMessage ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Senders of...';
-						shortcut: $n meta;
-						action: [ self browseSendersOfMessages ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Implementors of...';
-						shortcut: $m meta;
-						action: [ self browseImplementorsOfMessages ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Versions';
-						shortcut: $v meta;
-						action: [ self browseVersions ] ] ];
-		yourself
-]
-
-{ #category : 'shortcuts' }
-SpChangeSorterPresenter >> methodShortcuts: event from: aMorph [
-
-	self selectedSelector
-		ifNotNil:[
-			event keyString = '<Cmd-b>' ifTrue: [ ^ self browseMethodFull ].
-			event keyString = '<Cmd-d>' ifTrue: [ ^ self forgetMessage ].
-			event keyString = '<Cmd-m>' ifTrue: [ ^ self browseImplementorsOfMessages ].
-			event keyString = '<Cmd-n>' ifTrue: [ ^ self browseSendersOfMessages ].
-			event keyString = '<Cmd-v>' ifTrue: [ ^ self browseVersions ].
-			event keyString = '<Cmd-x>' ifTrue: [ ^ self removeMessage ]].
-]
-
-{ #category : 'accessing' }
-SpChangeSorterPresenter >> methodsListPresenter [
-
-	^ methodsListPresenter
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> methodsMenu: aBlock [
-
-	methodsListPresenter contextMenu: aBlock
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> methodsOn: aShortcut do: aBlock [
-
-	methodsListPresenter bindKeyCombination: aShortcut toAction: aBlock
-]
-
-{ #category : 'accessing' }
-SpChangeSorterPresenter >> model [
-
-	^ model
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> newSet [
-
-	| aSet |
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self okToChange ifFalse: [ ^ self ].
-	aSet := self model createNewSet.
-	aSet
-		ifNotNil: [ self updateChangesList.
-			changesListPresenter selectItem: aSet.
-			self updateWindowTitle ]
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> openChangeSetBrowser [
-
-	| cs |
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	cs := self selectedChangeSet ifNil: [ ^ self ].
-	^ self application tools messageList browseClasses: (RBBrowserEnvironment new forClasses: cs changedClasses)
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> registerChangeActions [
-
-	changesListPresenter
-		whenSelectionChangedDo: [ :selection | 
-			self updateTextContents.
-			selection selectedItem
-				ifNil: [ classesListPresenter items: {}.
-					methodsListPresenter items: {} ]
-				ifNotNil: [ :change | 
-					classesListPresenter unselectAll.
-					classesListPresenter items: change changedClasses ] ]
-]
-
-{ #category : 'shortcuts' }
-SpChangeSorterPresenter >> registerChangeSetShortcuts: aWidget [
-
-	aWidget bindKeyCombination: PharoShortcuts current browseShortcut toAction: [ self selectedChangeSet ifNotNil:[ self browseChangeSet ]].
-	aWidget bindKeyCombination: $b meta shift toAction: [ self selectedChangeSet ifNotNil:[ self openChangeSetBrowser ]].
-	aWidget bindKeyCombination: $m meta toAction: [ self selectedChangeSet ifNotNil:[ self setCurrentChangeSet ]].
-	aWidget bindKeyCombination: $n meta toAction: [ self selectedChangeSet ifNotNil:[ self newSet ]].
-	aWidget bindKeyCombination: $o meta toAction: [ self selectedChangeSet ifNotNil:[ self fileOut ]].
-	aWidget bindKeyCombination: $r meta toAction: [ self selectedChangeSet ifNotNil:[ self rename ]].
-	aWidget bindKeyCombination: $p meta toAction: [ self selectedChangeSet ifNotNil:[ self addPreamble ]].
-	aWidget bindKeyCombination: PharoShortcuts current removeShortcut toAction: [ self selectedChangeSet ifNotNil:[ self remove ]].
-	aWidget bindKeyCombination: $f meta toAction: [ self findChangeSet ]
-		
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> registerClassActions [
-
-	classesListPresenter
-		whenSelectionChangedDo: [ :selection | 
-			self updateTextContents.
-			textPresenter behavior: selection selectedItem.
-			textPresenter syntaxHighlight: false.
-			selection selectedItem
-				ifNil: [ methodsListPresenter items: {} ]
-				ifNotNil: [ :class | 
-					methodsListPresenter unselectAll.
-					methodsListPresenter items: (self selectedChangeSet selectorsInClass: class name) sort ] ]
-]
-
-{ #category : 'shortcuts' }
-SpChangeSorterPresenter >> registerClassShortcuts: aWidget [
-
-	aWidget bindKeyCombination: PharoShortcuts current browseShortcut toAction: [ self selectedClass ifNotNil:[ self browseMethodFull ]].
-	aWidget bindKeyCombination: $d meta toAction: [ self selectedClass ifNotNil:[ self forgetClass ]].
-	aWidget bindKeyCombination: PharoShortcuts current removeShortcut toAction: [ self selectedClass ifNotNil:[ self removeClass ]]
-]
-
-{ #category : 'shortcuts' }
-SpChangeSorterPresenter >> registerMethodShortcuts: aWidget [
-
-	aWidget bindKeyCombination: PharoShortcuts current browseShortcut toAction: [ self selectedSelector ifNotNil:[ self browseMethodFull ]].
-	aWidget bindKeyCombination: $d meta toAction: [ self selectedSelector ifNotNil:[ self forgetMessage ]].
-	aWidget bindKeyCombination: PharoShortcuts current browseImplementorsShortcut toAction: [ self selectedSelector ifNotNil:[ self browseImplementorsOfMessages ]].
-	aWidget bindKeyCombination: PharoShortcuts current browseSendersShortcut toAction: [ self selectedSelector ifNotNil:[ self browseSendersOfMessages ]].
-	aWidget bindKeyCombination: PharoShortcuts current browseVersionsShortcut toAction: [ self selectedSelector ifNotNil:[ self browseVersions ]].
-	aWidget bindKeyCombination: PharoShortcuts current removeShortcut toAction: [ self selectedSelector ifNotNil:[ self removeMessage ]].
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> registerSelectorActions [
-
-	methodsListPresenter whenSelectionChangedDo: [ :selection | self updateTextContents ]
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> remove [
-	"Completely destroy my change set.  Check if it's OK first"
-
-	self okToChange ifFalse: [^ self].
-	self model removeChangeSet: self selectedChangeSet prompting: true.
-	self updateChangesList.
-	changesListPresenter resetSelection
-]
-
-{ #category : 'menu - class' }
-SpChangeSorterPresenter >> removeClass [
-	"Remove the selected class from the system, at interactive user request.  Make certain the user really wants to do this, since it is not reversible.  Answer true if removal actually happened."
-
-	(SystemNavigation new removeClass: self selectedClass)
-		ifTrue: [ self setSelectedChangeSet: self selectedChangeSet ]
-]
-
-{ #category : 'menu - message' }
-SpChangeSorterPresenter >> removeMessage [
-	"Remove the selected message from the system."
-	
-	self okToChange
-		ifFalse: [^ self].
-	self selectedSelector
-		ifNotNil: [:selector | | class method | 
-			class := self selectedClass.
-				(class includesSelector: selector) ifFalse:[^ self].
-				method := class>>selector.
-				(SystemNavigation new removeMethod: method inClass: class)
-					ifTrue: [ self updateMessagesList ]]
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> removePostscript [
-
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self model removePostscriptFrom: self selectedChangeSet.
-	changesListPresenter selectItem: self selectedChangeSet
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> removePreamble [
-
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self selectedChangeSet hasPreamble ifFalse: [ ^ self inform: 'Change set has no preamble' ].
-	self selectedChangeSet removePreamble.
-	changesListPresenter selectItem: self selectedChangeSet
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> rename [
-	| set |
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	set := self model rename: self selectedChangeSet.
-
-	changesListPresenter
-		updateList;
-		selectItem: set.
-	self updateWindowTitle
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> selectedChangeSet [
-
-	^ changesListPresenter selection selectedItem
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> selectedChangeSetIndex [
-
-	^ changesListPresenter selectedIndex
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> selectedClass [
-	^ classesListPresenter selection selectedItem
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> selectedClassIndex [
-
-	 ^ classesListPresenter selectedIndex
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> selectedSelector [
-
-	^ methodsListPresenter selection selectedItem
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> selectorsMenu: aBlock [
-
-	methodsListPresenter menu: aBlock
-]
-
-{ #category : 'menu - change set' }
-SpChangeSorterPresenter >> setCurrentChangeSet [
-
-	self selectedChangeSet ifNil: [ ^ self inform: 'No change set selected' ].
-	self model setCurrentChangeSet: self selectedChangeSet.
-	self updateWindowTitle
-]
-
-{ #category : 'initialization' }
-SpChangeSorterPresenter >> setFocus [
-
-	self focusOrder
-		add: changesListPresenter;
-		add: classesListPresenter;
-		add: methodsListPresenter;
-		add: textPresenter
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> setSelectedChangeSet: aChangeSet [
-
-	 ^ changesListPresenter selectItem: aChangeSet
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> setSelectedChangeSetIndex: anIndex [
-
-	 ^ changesListPresenter selectIndex: anIndex
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> setSelectedClass: aClass [
-
-	 ^ classesListPresenter selectItem: aClass
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> setSelectedClassIndex: anIndex [
-
-	 ^ classesListPresenter selectIndex: anIndex
-]
-
-{ #category : 'accessing' }
-SpChangeSorterPresenter >> textPresenter [
-
-	^ textPresenter
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> title [
-	^ String streamContents: [ :stream | stream << self class title << ' on: ' << self model currentChangeSet name ]
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> updateChangesList [
-
-	| sel |
-	sel := self selectedChangeSet.
-	changesListPresenter items: self model allChanges.
-	changesListPresenter selectItem: sel
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> updateClassesList [
-
-	| sel |
-	sel := self selectedClass.
-	self selectedChangeSet
-		ifNil: [ classesListPresenter items: {} ]
-		ifNotNil: [ :change | 
-			classesListPresenter
-				items: (change changedClasses sort: [ :a :b | a name < b name ]) ].
-	sel ifNotNil: [ classesListPresenter selectItem: sel ]
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> updateClassesListAndMessagesList [
-
-	| sel |
-	sel := methodsListPresenter selectedItem.
-	self updateClassesList.
-	methodsListPresenter selectItem: sel.
-	self updateMessagesList
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> updateMessagesList [
-
-	| sel |
-	sel := methodsListPresenter selectedItem.
-	
-	self selectedClass
-			ifNil: [ methodsListPresenter items: {} ]
-			ifNotNil: [:class | methodsListPresenter items: (self selectedChangeSet selectorsInClass: class name) sort].
-				
-	methodsListPresenter selectItem: sel
-]
-
-{ #category : 'private' }
-SpChangeSorterPresenter >> updateTextContents [
-
-	| text |
-	text := self model setContentsOfChangeSet: self selectedChangeSet forClass: self selectedClass andSelector: self selectedSelector.
-	(text asString lines
-		anySatisfy: [ :line | 
-			self model classDescriptionsMap values , {'Method was added, but cannot be found!' . 'Added then removed (see versions)' . 'Method has been removed (see versions)' . 'Class organization was changed.'}
-				includes: line ]) ifTrue: [ textPresenter withoutSyntaxHighlight ] ifFalse: [ textPresenter withSyntaxHighlight ].
-	textPresenter text: text
-]
-
-{ #category : 'private - updating' }
-SpChangeSorterPresenter >> updateTitle [
-	self withWindowDo: [ :window | window title: self title ]
-]
-
-{ #category : 'api' }
-SpChangeSorterPresenter >> updateWindowTitle [
-
-	self withWindowDo: [ :window | window title: self title ]
-]
-
-{ #category : 'api - events' }
-SpChangeSorterPresenter >> whenChangesListChanges: aBlock [
-
-	changesListPresenter whenModelChangedDo: aBlock
-]
diff --git a/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st b/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st
deleted file mode 100644
index 1cde34597..000000000
--- a/src/NewTools-ChangeSorter/SpDualChangeSorterPresenter.class.st
+++ /dev/null
@@ -1,342 +0,0 @@
-"
-A `SpDualChangeSorterPresenter is a dual change sorter. It manages two sets of changes so that we can cherry pick and creates new changes. 
-
-`SpDualChangeSorterPresenter` shares the model between its two subcomponents that are instances of  `SpChangeSorterPresenter`. The class `ChangeSorterModel` defines the application logic.
-
-"
-Class {
-	#name : 'SpDualChangeSorterPresenter',
-	#superclass : 'StPresenter',
-	#instVars : [
-		'model',
-		'changeSorterLeft',
-		'changeSorterRight',
-		'isRefreshing'
-	],
-	#category : 'NewTools-ChangeSorter',
-	#package : 'NewTools-ChangeSorter'
-}
-
-{ #category : 'layout' }
-SpDualChangeSorterPresenter class >> defaultLayout [
-
-	^ SpPanedLayout newLeftToRight
-		add: #changeSorterLeft;
-		add: #changeSorterRight;
-		yourself
-]
-
-{ #category : 'menu' }
-SpDualChangeSorterPresenter class >> menuCommandOn: aBuilder [
-	<worldMenu>
-	
-	(aBuilder group: #SystemChanges)
-		parent: #Tools;
-		order: 410;
-		with: [ 
-			(aBuilder item: #'Change Sorter')
-				action: [ self open ];
-				help: 'Examine the different change set of the image.';
-				icon: (aBuilder iconNamed: self taskbarIconName) ].
-	aBuilder withSeparatorAfter
-]
-
-{ #category : 'opening' }
-SpDualChangeSorterPresenter class >> open [
-	<script>
-	
-	self new open
-]
-
-{ #category : 'tools-registry' }
-SpDualChangeSorterPresenter class >> registerToolsOn: registry [
-	"Add ourselves to registry. See [Smalltalk tools]"
-
-	registry register: self as: #changeSorter
-]
-
-{ #category : 'icons' }
-SpDualChangeSorterPresenter class >> taskbarIconName [
-	^ #changeSorter
-]
-
-{ #category : 'accessing' }
-SpDualChangeSorterPresenter class >> title [
-	^ 'Dual Change Sorter'
-]
-
-{ #category : 'menu' }
-SpDualChangeSorterPresenter >> changeSetMenuFrom: sourcePanel to: destinationPanel [
-	"Fill aMenu with items appropriate for the changes list"
-
-	^ sourcePanel changeSetMenu
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Copy all to the other change set';
-						shortcut: $s meta;
-						action: [ self copyAllFrom: sourcePanel to: destinationPanel ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Submerge into the other change set';
-						action: [ self submergeFrom: sourcePanel into: destinationPanel ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Subtract the other change set';
-						shortcut: $- meta;
-						action: [ self subtractFrom: sourcePanel to: destinationPanel ] ] ];
-		yourself
-]
-
-{ #category : 'accessing' }
-SpDualChangeSorterPresenter >> changeSorterLeft [
-
-	^ changeSorterLeft
-]
-
-{ #category : 'accessing' }
-SpDualChangeSorterPresenter >> changeSorterRight [
-
-	^ changeSorterRight
-]
-
-{ #category : 'menu - change set' }
-SpDualChangeSorterPresenter >> checkThatSidesDiffer: escapeBlock [
-	"If the change sets on both sides of the dual sorter are the same, put up an error message and escape via escapeBlock, else proceed happily"
-
-	changeSorterLeft selectedChangeSet == changeSorterRight selectedChangeSet
-		ifFalse: [ ^ self ].
-	self
-		inform:
-			'This command requires that the
-change sets selected on the two
-sides of the change sorter *not*
-be the same.'.
-	^ escapeBlock value
-]
-
-{ #category : 'menu' }
-SpDualChangeSorterPresenter >> classMenuFrom: sourcePanel to: destinationPanel [
-	"Fill aMenu with items appropriate for the class list"
-
-	^ sourcePanel classMenu
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Copy class to the other change set';
-						action: [ self copyClassFrom: sourcePanel to: destinationPanel ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Move class to the other change set';
-						action: [ self moveClassFrom: sourcePanel to: destinationPanel ] ] ];
-		yourself
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> connectPresenters [
-
-	changeSorterLeft 	whenChangesListChanges: [ self refeshedChangeSet: changeSorterRight ].
-	changeSorterRight	whenChangesListChanges: [ self refeshedChangeSet: changeSorterLeft ].
-
-
-]
-
-{ #category : 'menu - change set' }
-SpDualChangeSorterPresenter >> copyAllFrom: src to: dest [
-
-	self checkThatSidesDiffer: [ ^ self ].
-	self model copyAllChangesFrom: (src selectedChangeSet) to: (dest selectedChangeSet).
-	dest updateClassesList.
-]
-
-{ #category : 'menu - class' }
-SpDualChangeSorterPresenter >> copyClassFrom: src to: dest [
-	"Place these changes in the other changeSet also"
-
-	| otherChangeSet |
-	self checkThatSidesDiffer: [ ^ self ].
-	self okToChange ifFalse: [ ^ self inform: 'Can''t discard edits.' ].
-	src selectedClass ifNil: [ ^ self inform: 'Selected class is nil.' ].
-	otherChangeSet := dest selectedChangeSet.
-	
-	self model copyClass: src selectedClass from: src selectedChangeSet to: otherChangeSet.
-	
-	dest setSelectedChangeSet: otherChangeSet.
-]
-
-{ #category : 'menu - method' }
-SpDualChangeSorterPresenter >> copyMethodFrom: src to: dest [
-	"Place this change in the other changeSet also"	
-	| other |
-	
-	self checkThatSidesDiffer: [^ self].
-	other := dest selectedChangeSet.
-	
-	src selectedSelector ifNotNil: [:selector || class |
-		class := src selectedClass.
-		
-		self model 
-			copySelector: selector 
-			inClass: class 
-			from: src selectedChangeSet 
-			to: other.
-			
-		dest updateClassesListAndMessagesList ].
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> initialize [
-
-	model := ChangeSorterModel new.
-	isRefreshing := false.
-	super initialize.
-	SystemAnnouncer uniqueInstance weak
-		when: CurrentChangeSetChanged
-		send: #updateTitle
-		to: self
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> initializePresenters [
-
-	changeSorterLeft := self instantiate: SpChangeSorterPresenter.
-	changeSorterRight := self instantiate: SpChangeSorterPresenter.
-		
-	self menusRegistration.
-	self shortcutsRegistration.
-	self setFocusOrder
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> initializeWindow: aWindowPresenter [
-	aWindowPresenter initialExtent: 900 @ 530.
-	aWindowPresenter title: self title
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> menusRegistration [
-
-	self menusRegistrationFrom: changeSorterLeft to: changeSorterRight.
-	self menusRegistrationFrom: changeSorterRight to: changeSorterLeft
-]
-
-{ #category : 'menu' }
-SpDualChangeSorterPresenter >> menusRegistrationFrom: src to: dest [
-	src changesMenu: (self changeSetMenuFrom: src to: dest).
-	src classesMenu: (self classMenuFrom: src to: dest).
-	src methodsMenu: (self messageMenuFrom: src to: dest)
-]
-
-{ #category : 'menu' }
-SpDualChangeSorterPresenter >> messageMenuFrom: sourcePanel to: destinationPanel [
-	"Fill aMenu with items appropriate for the message list; could be for a single or double changeSorter"
-
-	^ sourcePanel messageMenu
-		addGroup: [ :aGroup | 
-			aGroup
-				addItem: [ :anItem | 
-					anItem
-						name: 'Copy method to the other change set';
-						action: [ self copyMethodFrom: sourcePanel to: destinationPanel ] ];
-				addItem: [ :anItem | 
-					anItem
-						name: 'Move method to the other change set';
-						action: [ self moveMethodFrom: sourcePanel to: destinationPanel ] ] ];
-		yourself
-]
-
-{ #category : 'accessing' }
-SpDualChangeSorterPresenter >> model [
-
-	^ model
-]
-
-{ #category : 'menu - class' }
-SpDualChangeSorterPresenter >> moveClassFrom: src to: dest [
-
-	self checkThatSidesDiffer: [^ self].
-	(self okToChange and: [ src selectedClass notNil]) ifFalse: [ ^ self ].
-
-	self copyClassFrom: src to: dest.
-	src forgetClass
-]
-
-{ #category : 'menu - method' }
-SpDualChangeSorterPresenter >> moveMethodFrom: src to: dest [
-
-	self copyMethodFrom: src to: dest.
-	src forgetMessage.
-	src updateClassesListAndMessagesList.
-]
-
-{ #category : 'event' }
-SpDualChangeSorterPresenter >> refeshedChangeSet: changeSet [
-	isRefreshing
-		ifTrue: [ ^ self ].
-	isRefreshing := true.
-	changeSet updateChangesList.
-	isRefreshing := false
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> setFocusOrder [
-
-	self focusOrder
-		add: changeSorterLeft;
-		add: changeSorterRight.
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> shortcutsRegistration [
-
-	self shortcutsRegistrationFrom: changeSorterLeft to: changeSorterRight.
-	self shortcutsRegistrationFrom: changeSorterRight to: changeSorterLeft.
-]
-
-{ #category : 'initialization' }
-SpDualChangeSorterPresenter >> shortcutsRegistrationFrom: src to: dest [
-	
-	src changesPresenterOn: $c meta do: [ self copyAllFrom: src to: dest ].
-	src changesPresenterOn: $- meta do: [ self subtractFrom: src to: dest ]. 
-]
-
-{ #category : 'menu - change set' }
-SpDualChangeSorterPresenter >> submergeFrom: src into: dest [
-	"Copy the contents of the receiver to the other side, then remove the receiver -- all after checking that all is well."
-	| source destination index |
-
-	source := src selectedChangeSet.
-	destination := dest selectedChangeSet.
-	index := src selectedChangeSetIndex.
-
-	(self model submerge: source into: destination) ifFalse: [ ^ self ].
-	
-	src updateChangesList.
-	src setSelectedChangeSetIndex: index.
-]
-
-{ #category : 'menu - change set' }
-SpDualChangeSorterPresenter >> subtractFrom: src to: dest [
-	"Subtract the changes found on the other side from the requesting side."
-	| source destination |
-	source := src selectedChangeSet.
-	destination := dest selectedChangeSet.
-	
-	self checkThatSidesDiffer: [^ self].
-	
-	self model subtractFrom: source to: destination.
-	
-	changeSorterRight setSelectedChangeSet: source.
-]
-
-{ #category : 'api - window' }
-SpDualChangeSorterPresenter >> title [
-	^ String streamContents: [ :stream | stream << self class title << ' on: ' << self model currentChangeSet name ]
-]
-
-{ #category : 'api' }
-SpDualChangeSorterPresenter >> updateTitle [
-	self window title: self title
-]
diff --git a/src/NewTools-ChangeSorter/package.st b/src/NewTools-ChangeSorter/package.st
deleted file mode 100644
index 7c31fe453..000000000
--- a/src/NewTools-ChangeSorter/package.st
+++ /dev/null
@@ -1 +0,0 @@
-Package { #name : 'NewTools-ChangeSorter' }
diff --git a/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st b/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st
index 397a4ecc5..898318932 100644
--- a/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st
+++ b/src/NewTools-SystemReporter/StSystemReporterPresenter.class.st
@@ -94,9 +94,7 @@ StSystemReporterPresenter >> reportImage: aStream [
 	aStream 
 		nextPutAll: Smalltalk image imagePath; cr;
 		nextPutAll: SystemVersion current version; cr;
-		nextPutAll: Smalltalk image lastUpdateString; cr;
-		nextPutAll: ChangeSet current name; cr
-
+		nextPutAll: Smalltalk image lastUpdateString; cr
 ]
 
 { #category : 'building report' }