diff --git a/repository/JQuery-Tests-Core.package/JQFunctionalTest.class/instance/listOfCountryNames.st b/repository/JQuery-Tests-Core.package/JQFunctionalTest.class/instance/listOfCountryNames.st
new file mode 100644
index 000000000..c199a81f1
--- /dev/null
+++ b/repository/JQuery-Tests-Core.package/JQFunctionalTest.class/instance/listOfCountryNames.st
@@ -0,0 +1,4 @@
+private
+listOfCountryNames
+
+	^ ((OrderedCollection new) add: 'Afghanistan'; add: 'Albania'; add: 'Algeria'; add: 'Andorra'; add: 'Angola'; add: 'Antigua & Deps'; add: 'Argentina'; add: 'Armenia'; add: 'Australia'; add: 'Austria'; add: 'Azerbaijan'; add: 'Bahamas'; add: 'Bahrain'; add: 'Bangladesh'; add: 'Barbados'; add: 'Belarus'; add: 'Belgium'; add: 'Belize'; add: 'Benin'; add: 'Bhutan'; add: 'Bolivia'; add: 'Bosnia Herzegovina'; add: 'Botswana'; add: 'Brazil'; add: 'Brunei'; add: 'Bulgaria'; add: 'Burkina'; add: 'Burundi'; add: 'Cambodia'; add: 'Cameroon'; add: 'Canada'; add: 'Cape Verde'; add: 'Central African Rep'; add: 'Chad'; add: 'Chile'; add: 'China'; add: 'Colombia'; add: 'Comoros'; add: 'Congo'; add: 'Congo {Democratic Rep}'; add: 'Costa Rica'; add: 'Croatia'; add: 'Cuba'; add: 'Cyprus'; add: 'Czech Republic'; add: 'Denmark'; add: 'Djibouti'; add: 'Dominica'; add: 'Dominican Republic'; add: 'East Timor'; add: 'Ecuador'; add: 'Egypt'; add: 'El Salvador'; add: 'Equatorial Guinea'; add: 'Eritrea'; add: 'Estonia'; add: 'Ethiopia'; add: 'Fiji'; add: 'Finland'; add: 'France'; add: 'Gabon'; add: 'Gambia'; add: 'Georgia'; add: 'Germany'; add: 'Ghana'; add: 'Greece'; add: 'Grenada'; add: 'Guatemala'; add: 'Guinea'; add: 'Guinea-Bissau'; add: 'Guyana'; add: 'Haiti'; add: 'Honduras'; add: 'Hungary'; add: 'Iceland'; add: 'India'; add: 'Indonesia'; add: 'Iran'; add: 'Iraq'; add: 'Ireland {Republic}'; add: 'Israel'; add: 'Italy'; add: 'Ivory Coast'; add: 'Jamaica'; add: 'Japan'; add: 'Jordan'; add: 'Kazakhstan'; add: 'Kenya'; add: 'Kiribati'; add: 'Korea North'; add: 'Korea South'; add: 'Kosovo'; add: 'Kuwait'; add: 'Kyrgyzstan'; add: 'Laos'; add: 'Latvia'; add: 'Lebanon'; add: 'Lesotho'; add: 'Liberia'; add: 'Libya'; add: 'Liechtenstein'; add: 'Lithuania'; add: 'Luxembourg'; add: 'Macedonia'; add: 'Madagascar'; add: 'Malawi'; add: 'Malaysia'; add: 'Maldives'; add: 'Mali'; add: 'Malta'; add: 'Marshall Islands'; add: 'Mauritania'; add: 'Mauritius'; add: 'Mexico'; add: 'Micronesia'; add: 'Moldova'; add: 'Monaco'; add: 'Mongolia'; add: 'Montenegro'; add: 'Morocco'; add: 'Mozambique'; add: 'Myanmar, {Burma}'; add: 'Namibia'; add: 'Nauru'; add: 'Nepal'; add: 'Netherlands'; add: 'New Zealand'; add: 'Nicaragua'; add: 'Niger'; add: 'Nigeria'; add: 'Norway'; add: 'Oman'; add: 'Pakistan'; add: 'Palau'; add: 'Panama'; add: 'Papua New Guinea'; add: 'Paraguay'; add: 'Peru'; add: 'Philippines'; add: 'Poland'; add: 'Portugal'; add: 'Qatar'; add: 'Romania'; add: 'Russian Federation'; add: 'Rwanda'; add: 'St Kitts & Nevis'; add: 'St Lucia'; add: 'Saint Vincent & the Grenadines'; add: 'Samoa'; add: 'San Marino'; add: 'Sao Tome & Principe'; add: 'Saudi Arabia'; add: 'Senegal'; add: 'Serbia'; add: 'Seychelles'; add: 'Sierra Leone'; add: 'Singapore'; add: 'Slovakia'; add: 'Slovenia'; add: 'Solomon Islands'; add: 'Somalia'; add: 'South Africa'; add: 'South Sudan'; add: 'Spain'; add: 'Sri Lanka'; add: 'Sudan'; add: 'Suriname'; add: 'Swaziland'; add: 'Sweden'; add: 'Switzerland'; add: 'Syria'; add: 'Taiwan'; add: 'Tajikistan'; add: 'Tanzania'; add: 'Thailand'; add: 'Togo'; add: 'Tonga'; add: 'Trinidad & Tobago'; add: 'Tunisia'; add: 'Turkey'; add: 'Turkmenistan'; add: 'Tuvalu'; add: 'Uganda'; add: 'Ukraine'; add: 'United Arab Emirates'; add: 'United Kingdom'; add: 'United States'; add: 'Uruguay'; add: 'Uzbekistan'; add: 'Vanuatu'; add: 'Vatican City'; add: 'Venezuela'; add: 'Vietnam'; add: 'Yemen'; add: 'Zambia'; add: 'Zimbabwe'; yourself)
\ No newline at end of file
diff --git a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/countriesForCurrencyCode..st b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/countriesForCurrencyCode..st
new file mode 100644
index 000000000..998ddea80
--- /dev/null
+++ b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/countriesForCurrencyCode..st
@@ -0,0 +1,4 @@
+private
+countriesForCurrencyCode: aCurrencyCode
+
+	^ self countriesPerCurrencyCode at: aCurrencyCode
\ No newline at end of file
diff --git a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/countriesPerCurrencyCode.st b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/countriesPerCurrencyCode.st
new file mode 100644
index 000000000..abc59958f
--- /dev/null
+++ b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/countriesPerCurrencyCode.st
@@ -0,0 +1,197 @@
+private
+countriesPerCurrencyCode
+
+	^ Dictionary new
+		  add: 'AFN' -> #( 'Afghanistan' );
+		  add: 'ALL' -> #( 'Albania' );
+		  add: 'DZD' -> #( 'Algeria' );
+		  add:
+			  'USD' -> #( 'American Samoa' 'British Indian Ocean Territory'
+				     'East Timor' 'Guam' 'Marshall Islands' 'Micronesia, Federated States of'
+				     'Northern Mariana Islands' 'Palau' 'Puerto Rico'
+				     'Turks and Caicos Islands' 'United States' 'United States Minor Outlying Islands'
+				     'Virgin Islands, British' 'Virgin Islands, U.S.' );
+		  add: 'EUR'
+			  -> #( 'Andorra' 'Austria' 'Belgium' 'Croatia' 'Cyprus' 'Estonia'
+				     'Finland' 'France' 'French Guiana' 'French Southern territories'
+				     'Germany' 'Greece' 'Guadeloupe' 'Holy See (Vatican City State)'
+				     'Ireland' 'Italy' 'Latvia' 'Lithuania' 'Luxembourg'
+				     'Malta' 'Martinique' 'Mayotte' 'Monaco' 'Netherlands'
+				     'Portugal' 'Reunion' 'Saint Pierre and Miquelon'
+				     'San Marino' 'Slovakia' 'Slovenia' 'Spain' );
+		  add: 'AOA' -> #( 'Angola' );
+		  add: 'XCD'
+			  ->
+				  #( 'Anguilla' 'Antarctica' 'Antigua and Barbuda'
+				     'Dominica' 'Grenada' 'Montserrat' 'Saint Kitts and Nevis'
+				     'Saint Lucia' 'Saint Vincent and the Grenadines' );
+		  add: 'ARS' -> #( 'Argentina' );
+		  add: 'AMD' -> #( 'Armenia' );
+		  add: 'AWG' -> #( 'Aruba' );
+		  add:
+			  'AUD'
+			  -> #( 'Australia' 'Christmas Island' 'Cocos (Keeling) Islands'
+				     'Heard Island and McDonald Islands'
+				     'Kiribati' 'Nauru' 'Norfolk Island' 'Tuvalu' );
+		  add: 'AZN' -> #( 'Azerbaijan' );
+		  add: 'BSD' -> #( 'Bahamas' );
+		  add: 'BHD' -> #( 'Bahrain' );
+		  add: 'BDT' -> #( 'Bangladesh' );
+		  add: 'BBD' -> #( 'Barbados' );
+		  add: 'BYR' -> #( 'Belarus' );
+		  add: 'BZD' -> #( 'Belize' );
+		  add: 'XOF'
+			  ->
+				  #( 'Benin' 'Burkina Faso' 'Ivory Coast' 'Mali' 'Niger' 'Senegal'
+				     'Togo' );
+		  add: 'BMD' -> #( 'Bermuda' );
+		  add: 'BTN' -> #( 'Bhutan' );
+		  add: 'BOB' -> #( 'Bolivia' );
+		  add: 'BAM' -> #( 'Bosnia and Herzegovina' );
+		  add: 'BWP' -> #( 'Botswana' );
+		  add:
+			  'NOK' -> #( 'Bouvet Island' 'Norway' 'Svalbard and Jan Mayen' );
+		  add: 'BRL' -> #( 'Brazil' );
+		  add: 'BND' -> #( 'Brunei' );
+		  add: 'BGN' -> #( 'Bulgaria' );
+		  add: 'BIF' -> #( 'Burundi' );
+		  add: 'KHR' -> #( 'Cambodia' );
+		  add: 'XAF'
+			  ->
+				  #( 'Cameroon' 'Central African Republic'
+				     'Chad' 'Congo' 'Equatorial Guinea' 'Gabon' );
+		  add: 'CAD' -> #( 'Canada' );
+		  add: 'CVE' -> #( 'Cape Verde' );
+		  add: 'KYD' -> #( 'Cayman Islands' );
+		  add: 'CLP' -> #( 'Chile' );
+		  add: 'CNY' -> #( 'China' );
+		  add: 'COP' -> #( 'Colombia' );
+		  add: 'KMF' -> #( 'Comoros' );
+		  add:
+			  'NZD'
+			  -> #( 'Cook Islands' 'New Zealand' 'Niue' 'Pitcairn Islands'
+				     'Tokelau' );
+		  add: 'CRC' -> #( 'Costa Rica' );
+		  add: 'CUP' -> #( 'Cuba' );
+		  add: 'CZK' -> #( 'Czech Republic' );
+		  add: 'DKK' -> #( 'Denmark' 'Faroe Islands' 'Greenland' );
+		  add: 'DJF' -> #( 'Djibouti' );
+		  add: 'DOP' -> #( 'Dominican Republic' );
+		  add: 'ECS' -> #( 'Ecuador' );
+		  add: 'EGP' -> #( 'Egypt' );
+		  add: 'SVC' -> #( 'El Salvador' );
+		  add: 'GBP'
+			  ->
+				  #( 'England' 'Northern Ireland' 'Scotland' 'South Georgia and the South Sandwich Islands'
+				     'United Kingdom' 'Wales' );
+		  add: 'ERN' -> #( 'Eritrea' );
+		  add: 'SZL' -> #( 'Eswatini' );
+		  add: 'ETB' -> #( 'Ethiopia' );
+		  add: 'FKP' -> #( 'Falkland Islands' );
+		  add: 'FJD' -> #( 'Fiji Islands' );
+		  add:
+			  'XPF'
+			  -> #( 'French Polynesia' 'New Caledonia' 'Wallis and Futuna' );
+		  add: 'GMD' -> #( 'Gambia' );
+		  add: 'GEL' -> #( 'Georgia' );
+		  add: 'GHS' -> #( 'Ghana' );
+		  add: 'GIP' -> #( 'Gibraltar' );
+		  add: 'QTQ' -> #( 'Guatemala' );
+		  add: 'GNF' -> #( 'Guinea' );
+		  add: 'CFA' -> #( 'Guinea-Bissau' );
+		  add: 'GYD' -> #( 'Guyana' );
+		  add: 'HTG' -> #( 'Haiti' );
+		  add: 'HNL' -> #( 'Honduras' );
+		  add: 'HKD' -> #( 'Hong Kong' );
+		  add: 'HUF' -> #( 'Hungary' );
+		  add: 'ISK' -> #( 'Iceland' );
+		  add: 'INR' -> #( 'India' );
+		  add: 'IDR' -> #( 'Indonesia' );
+		  add: 'IRR' -> #( 'Iran' );
+		  add: 'IQD' -> #( 'Iraq' );
+		  add: 'ILS' -> #( 'Israel' );
+		  add: 'JMD' -> #( 'Jamaica' );
+		  add: 'JPY' -> #( 'Japan' );
+		  add: 'JOD' -> #( 'Jordan' );
+		  add: 'KZT' -> #( 'Kazakhstan' );
+		  add: 'KES' -> #( 'Kenya' );
+		  add: 'KWD' -> #( 'Kuwait' );
+		  add: 'KGS' -> #( 'Kyrgyzstan' );
+		  add: 'LAK' -> #( 'Laos' );
+		  add: 'LBP' -> #( 'Lebanon' );
+		  add: 'LSL' -> #( 'Lesotho' );
+		  add: 'LRD' -> #( 'Liberia' );
+		  add: 'LYD' -> #( 'Libya' );
+		  add: 'CHF' -> #( 'Liechtenstein' 'Switzerland' );
+		  add: 'MOP' -> #( 'Macau' );
+		  add: 'MKD' -> #( 'North Macedonia' );
+		  add: 'MGF' -> #( 'Madagascar' );
+		  add: 'MWK' -> #( 'Malawi' );
+		  add: 'MYR' -> #( 'Malaysia' );
+		  add: 'MVR' -> #( 'Maldives' );
+		  add: 'MRO' -> #( 'Mauritania' );
+		  add: 'MUR' -> #( 'Mauritius' );
+		  add: 'MXN' -> #( 'Mexico' );
+		  add: 'MDL' -> #( 'Moldova' );
+		  add: 'MNT' -> #( 'Mongolia' );
+		  add: 'MAD' -> #( 'Morocco' 'Western Sahara' );
+		  add: 'MZN' -> #( 'Mozambique' );
+		  add: 'MMR' -> #( 'Myanmar' );
+		  add: 'NAD' -> #( 'Namibia' );
+		  add: 'NPR' -> #( 'Nepal' );
+		  add: 'ANG' -> #( 'Netherlands Antilles' );
+		  add: 'NIO' -> #( 'Nicaragua' );
+		  add: 'NGN' -> #( 'Nigeria' );
+		  add: 'KPW' -> #( 'North Korea' );
+		  add: 'OMR' -> #( 'Oman' );
+		  add: 'PKR' -> #( 'Pakistan' );
+		  add: nil -> #( 'Palestine' );
+		  add: 'PAB' -> #( 'Panama' );
+		  add: 'PGK' -> #( 'Papua New Guinea' );
+		  add: 'PYG' -> #( 'Paraguay' );
+		  add: 'PEN' -> #( 'Peru' );
+		  add: 'PHP' -> #( 'Philippines' );
+		  add: 'PLN' -> #( 'Poland' );
+		  add: 'QAR' -> #( 'Qatar' );
+		  add: 'RON' -> #( 'Romania' );
+		  add: 'RUB' -> #( 'Russia' );
+		  add: 'RWF' -> #( 'Rwanda' );
+		  add: 'SHP' -> #( 'Saint Helena' );
+		  add: 'WST' -> #( 'Samoa' );
+		  add: 'STD' -> #( 'Sao Tome and Principe' );
+		  add: 'SAR' -> #( 'Saudi Arabia' );
+		  add: 'RSD' -> #( 'Serbia' );
+		  add: 'SCR' -> #( 'Seychelles' );
+		  add: 'SLL' -> #( 'Sierra Leone' );
+		  add: 'SGD' -> #( 'Singapore' );
+		  add: 'SBD' -> #( 'Solomon Islands' );
+		  add: 'SOS' -> #( 'Somalia' );
+		  add: 'ZAR' -> #( 'South Africa' );
+		  add: 'KRW' -> #( 'South Korea' );
+		  add: 'SSP' -> #( 'South Sudan' );
+		  add: 'LKR' -> #( 'Sri Lanka' );
+		  add: 'SDG' -> #( 'Sudan' );
+		  add: 'SRD' -> #( 'Suriname' );
+		  add: 'SEK' -> #( 'Sweden' );
+		  add: 'SYP' -> #( 'Syria' );
+		  add: 'TJS' -> #( 'Tajikistan' );
+		  add: 'TZS' -> #( 'Tanzania' );
+		  add: 'THB' -> #( 'Thailand' );
+		  add: 'CDF' -> #( 'The Democratic Republic of Congo' );
+		  add: 'TOP' -> #( 'Tonga' );
+		  add: 'TTD' -> #( 'Trinidad and Tobago' );
+		  add: 'TND' -> #( 'Tunisia' );
+		  add: 'TRY' -> #( 'Turkey' );
+		  add: 'TMT' -> #( 'Turkmenistan' );
+		  add: 'UGX' -> #( 'Uganda' );
+		  add: 'UAH' -> #( 'Ukraine' );
+		  add: 'AED' -> #( 'United Arab Emirates' );
+		  add: 'UYU' -> #( 'Uruguay' );
+		  add: 'UZS' -> #( 'Uzbekistan' );
+		  add: 'VUV' -> #( 'Vanuatu' );
+		  add: 'VEF' -> #( 'Venezuela' );
+		  add: 'VND' -> #( 'Vietnam' );
+		  add: 'YER' -> #( 'Yemen' );
+		  add: 'ZMW' -> #( 'Zambia' );
+		  add: 'ZWD' -> #( 'Zimbabwe' );
+		  yourself
\ No newline at end of file
diff --git a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/currenciesAndCountriesOn..st b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/currenciesAndCountriesOn..st
new file mode 100644
index 000000000..5ff6850ea
--- /dev/null
+++ b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/currenciesAndCountriesOn..st
@@ -0,0 +1,10 @@
+private
+currenciesAndCountriesOn: json
+
+	json array: [
+		self listOfCurrencyCodes do:[ :currencyCode |
+			json object: [ 
+				json key: 'currency' value: currencyCode.
+				json key: 'countries' value: [  
+					json array: [ (self countriesForCurrencyCode: currencyCode) do: [ :country |
+						json value: [ json string: country ] ] ] ] ] ] ]
\ No newline at end of file
diff --git a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/listOfCurrencyCodes.st b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/listOfCurrencyCodes.st
new file mode 100644
index 000000000..7cc30d9e4
--- /dev/null
+++ b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/listOfCurrencyCodes.st
@@ -0,0 +1,4 @@
+private
+listOfCurrencyCodes
+
+	^ self countriesPerCurrencyCode keys
\ No newline at end of file
diff --git a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/renderJsonCallbackOn..st b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/renderJsonCallbackOn..st
index 2438239d3..13fe8c804 100644
--- a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/renderJsonCallbackOn..st
+++ b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/renderJsonCallbackOn..st
@@ -5,5 +5,5 @@ renderJsonCallbackOn: html
 	html textArea id: 'textarea'.
 	html document addLoadScript: 
 		(html jQuery getJson 
-				json: [ :json | self seasidePackagesOn: json ];
+				json: [ :json | self currenciesAndCountriesOn: json ];
 				onSuccess: ((html jQuery id: 'textarea') value: (JSStream on: 'JSON.stringify(arguments[0])')) asFunction)
\ No newline at end of file
diff --git a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/seasidePackagesOn..st b/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/seasidePackagesOn..st
deleted file mode 100644
index 89cd40ebe..000000000
--- a/repository/JQuery-Tests-Core.package/JQJsonFunctionalTest.class/instance/seasidePackagesOn..st
+++ /dev/null
@@ -1,10 +0,0 @@
-private
-seasidePackagesOn: json
-
-	json array: [
-		GRPackage grPackages do:[ :grPackage |
-			json object: [ 
-				json key: 'name' value: grPackage name.
-				json key: 'dependencies' value: [  
-					json array: [ grPackage dependencies do: [ :dep |
-						json value: [ json string: dep name ] ] ] ] ] ] ]
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/countryNames.st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/countryNames.st
new file mode 100644
index 000000000..e01872257
--- /dev/null
+++ b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/countryNames.st
@@ -0,0 +1,4 @@
+querying
+countryNames 
+	
+	^ countryNames ifNil: [ countryNames := self listOfCountryNames ]
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/countryNamesFor..st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/countryNamesFor..st
new file mode 100644
index 000000000..1d59330b0
--- /dev/null
+++ b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/countryNamesFor..st
@@ -0,0 +1,8 @@
+querying
+countryNamesFor: aString
+	| filtered |
+	filtered := self countryNames
+		select: [ :each | each includesSubstring: aString caseSensitive: false ].
+	filtered size > 10
+		ifTrue: [ filtered := filtered first: 10 ].
+	^ filtered
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/packageNamesFor..st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/packageNamesFor..st
deleted file mode 100644
index d902f4b75..000000000
--- a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/packageNamesFor..st
+++ /dev/null
@@ -1,8 +0,0 @@
-querying
-packageNamesFor: aString
-	| filtered |
-	filtered := self packages
-		select: [ :each | each name includesSubstring: aString caseSensitive: false ].
-	filtered size > 10
-		ifTrue: [ filtered := filtered first: 10 ].
-	^ filtered collect: [ :each | each name ]
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/packages.st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/packages.st
deleted file mode 100644
index 4bc624854..000000000
--- a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/packages.st
+++ /dev/null
@@ -1,3 +0,0 @@
-querying
-packages
-	^ packages ifNil: [ packages := GRPackage grPackages sorted: [ :a :b | a name < b name ] ]
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderContentOn..st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderContentOn..st
index 4e85561b0..82e7a1082 100644
--- a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderContentOn..st
+++ b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderContentOn..st
@@ -7,27 +7,26 @@ renderContentOn: html
 	html paragraph: [
 		html label
 			for: html nextId;
-			with: 'Type a Seaside package name (no callback):'.
+			with: 'Type a country name (no callback):'.
 		html break.
 		html textInput
 			id: html lastId;
-			script: (html jQuery this autocomplete sourceCallback: [ :term |
-						 self packageNamesFor: term ]) ].
+			script: (html jQuery this autocomplete sourceCallback: [ :term | self countryNamesFor: term ]) ].
 
 	html paragraph: [
 		html label
 			for: html nextId;
-			with: 'Type a Seaside package name (with callback):'.
+			with: 'Type a country name (with callback):'.
 		html break.
 		html textInput
 			id: html lastId;
 			script: (html jQuery this autocomplete
-					 search: [ :term | self packageNamesFor: term ]
-					 labels: [ :packagename | packagename ]
+					 search: [ :term | self countryNamesFor: term ]
+					 labels: [ :countryName | countryName ]
 					 callback: [ :val :s |
-						 selectedPackageName := val.
-						 s << (s jQuery id: showId) html: [ :r | self renderSelectedPackageNameOn: r ] ]).
+						 selectedCountryName := val.
+						 s << (s jQuery id: showId) html: [ :r | self renderSelectedCountryNameOn: r ] ]).
 		html break.
 		html div
 			id: showId;
-			with: [ self renderSelectedPackageNameOn: html ] ]
\ No newline at end of file
+			with: [ self renderSelectedCountryNameOn: html ] ]
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderSelectedCountryNameOn..st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderSelectedCountryNameOn..st
new file mode 100644
index 000000000..50ca3b0d4
--- /dev/null
+++ b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderSelectedCountryNameOn..st
@@ -0,0 +1,6 @@
+rendering
+renderSelectedCountryNameOn: html
+
+	html text: (selectedCountryName
+			 ifNil: [ 'No selected country' ]
+			 ifNotNil: [ selectedCountryName , ' was selected' ])
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderSelectedPackageNameOn..st b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderSelectedPackageNameOn..st
deleted file mode 100644
index 95ba0a631..000000000
--- a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/instance/renderSelectedPackageNameOn..st
+++ /dev/null
@@ -1,6 +0,0 @@
-rendering
-renderSelectedPackageNameOn: html
-
-	html text: (selectedPackageName
-			 ifNil: [ 'No package name selected' ]
-			 ifNotNil: [ selectedPackageName , ' was selected' ])
\ No newline at end of file
diff --git a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/properties.json b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/properties.json
index 00a2d47f2..72d75eb6f 100644
--- a/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/properties.json
+++ b/repository/JQuery-Tests-UI.package/JQAutocompleteFunctionalTest.class/properties.json
@@ -7,7 +7,8 @@
 	"classvars" : [ ],
 	"instvars" : [
 		"packages",
-		"selectedPackageName"
+		"countryNames",
+		"selectedCountryName"
 	],
 	"name" : "JQAutocompleteFunctionalTest",
 	"type" : "normal"
diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/allDirtyPackages.st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/allDirtyPackages.st
deleted file mode 100644
index 890f7e6ef..000000000
--- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/allDirtyPackages.st
+++ /dev/null
@@ -1,5 +0,0 @@
-accessing-packages
-allDirtyPackages
-	"Answer all dirty Seaside related packages."
-	
-	^ self allGRPackages select: [ :each | (self workingCopyFor: each) modified ]
\ No newline at end of file
diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/allGRPackages.st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/allGRPackages.st
deleted file mode 100644
index 8d3e615d3..000000000
--- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/allGRPackages.st
+++ /dev/null
@@ -1,5 +0,0 @@
-accessing-packages
-allGRPackages
-	"Answer all Seaside related packages sorted alphabetically."
-	
-	^ GRPackage grPackages sorted: [ :a :b | a name < b name ]
\ No newline at end of file
diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/browserEnvironment.st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/browserEnvironment.st
deleted file mode 100644
index fff1c297f..000000000
--- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/browserEnvironment.st
+++ /dev/null
@@ -1,6 +0,0 @@
-accessing
-browserEnvironment
-	"Answer a browser environment of all Seaside packages."
-	"self browserEnvironment open"
-	
-	^ self browserEnvironmentFor: self allGRPackages
\ No newline at end of file
diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/cleanupCategories.st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/cleanupCategories.st
deleted file mode 100644
index 915c0d38f..000000000
--- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/cleanupCategories.st
+++ /dev/null
@@ -1,29 +0,0 @@
-tools
-cleanupCategories
-	"Remove all the empty categories and fix common inconsistencies in categorie names and protocols."
-	"self cleanupCategories"
-
-	| cleanup new |
-	cleanup := [ :class :protocol |
-		new := protocol asLowercase.
-		(#(#'initialize-release' #'class-initialization') includes: new)
-			ifTrue: [ new := #initialization ].
-		(new = #'instance-creation')
-			ifTrue: [ new := #'instance creation' ].
-		((class includesBehavior: TestCase) and: [ (protocol = #'testing' or: [ protocol beginsWithSubCollection: #'testing-' ]) and: [ (class organization listAtCategoryNamed: protocol) allSatisfy: [ :each | each beginsWithSubCollection: #test ] ] ])
-			ifTrue: [ new := ('tests' , (protocol allButFirst: 7)) asSymbol ].
-		(new = protocol)
-			ifFalse: [ class organization renameCategory: protocol toBe: new ].
-		class organization removeEmptyCategories ].
-	Smalltalk organization removeEmptyCategories.
-	self allGRPackages
-		do: [ :each |
-			| package |
-			package := self packageWithName: each name.
-			package classesAndMetaClasses do: [ :class |
-				(package coreCategoriesForClass: class)
-					do: [ :protocol | cleanup value: class value: protocol ] ].
-			package extensionClasses do: [ :class |
-				(package extensionCategoriesForClass: class)
-					do: [ :protocol | cleanup value: class value: protocol ] ] ]
-		displayingProgress: 'cleaning up'
\ No newline at end of file
diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/gofers.st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/gofers.st
deleted file mode 100644
index 865e0739a..000000000
--- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/gofers.st
+++ /dev/null
@@ -1,6 +0,0 @@
-accessing
-gofers
-	"Answer a collection of gopher instances of all Seaside packages."
-	"self gofers do: [ :each | each load; recompile ]"
-	
-	^ self gofersFor: self allGRPackages
\ No newline at end of file
diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/graphFunctionalDependencies.tests..st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/graphFunctionalDependencies.tests..st
deleted file mode 100644
index c2c331fc2..000000000
--- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/graphFunctionalDependencies.tests..st
+++ /dev/null
@@ -1,38 +0,0 @@
-tools
-graphFunctionalDependencies: functionalBool tests: testsBool
-	"self graphFunctionalDependencies: true tests: true"
-
-	| packages analyzer |
-	packages := self allGRPackages
-		collect: [ :each | self packageWithName: each name ].
-	testsBool ifFalse: [
-		packages := packages reject: [ :each |
-			(each packageName indexOfSubCollection: '-Tests-' startingAt: 1) ~= 0 ] ].
-	(Smalltalk hasClassNamed: #PDPackageAnalyzer) ifFalse: [ 
-		| goferClass |
-		goferClass := (Smalltalk classNamed: #Gofer)
-			ifNil: [ self error: 'Please install Gofer.' ].
-		goferClass new
-			renggli: 'packaging';
-			package: 'GraphViz';
-			package: 'Package-Dependencies';
-			load ].
-	analyzer := (Smalltalk classNamed: #PDGraphPackageAnalyzer)
-		onPackages: packages.
-	functionalBool ifTrue: [ 
-		GRPackage grPackages 
-			do: [ :package | 
-				package dependencies do: [ :dep | 
-					| source target |
-					source := analyzer relation 
-						packageNamed: package name
-						ifAbsent: [ nil ].
-					target := analyzer relation 
-						packageNamed: dep name
-						ifAbsent: [ nil ].
-					(source notNil and: [ target notNil ]) ifTrue: [ 
-						source add: ((Smalltalk classNamed: #PDFunctionalDependency) 
-							from: source
-							to: target) ] ] ]
-			displayingProgress: 'Adding functional dependencies' ].
-	analyzer save: 'seaside.dot'
\ No newline at end of file
diff --git a/repository/Seaside-Pharo-Tools-Web.package/WASeasideVersionStatus.class/instance/sortedWorkingCopies.st b/repository/Seaside-Pharo-Tools-Web.package/WASeasideVersionStatus.class/instance/sortedWorkingCopies.st
index f7ff86cba..dc5115d2e 100644
--- a/repository/Seaside-Pharo-Tools-Web.package/WASeasideVersionStatus.class/instance/sortedWorkingCopies.st
+++ b/repository/Seaside-Pharo-Tools-Web.package/WASeasideVersionStatus.class/instance/sortedWorkingCopies.st
@@ -2,7 +2,7 @@ accessing
 sortedWorkingCopies
 	| categories packageNames workingCopies |
 	categories := Dictionary new.
-	packageNames := GRPackage grPackages collect: [ :each | each name ].
+	packageNames := BaselineOfSeaside3 project version packages collect: [ :each | each name ].
 	workingCopies := MCWorkingCopy allManagers select: [ :each | packageNames includes: each packageName ].
 	workingCopies do: 
 		[ :each |