diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6b357f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+**/.DS_Store
+.DS_STORE
\ No newline at end of file
diff --git a/.smalltalk.ston b/.smalltalk.ston
new file mode 100644
index 0000000..9a38f70
--- /dev/null
+++ b/.smalltalk.ston
@@ -0,0 +1,8 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'Hashtable',
+      #directory : 'src'
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..426e1bc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: smalltalk
+sudo: false
+
+os:
+- linux
+
+smalltalk:
+  - Pharo-7.0
\ No newline at end of file
diff --git a/src/BaselineOfHashtable/BaselineOfHashtable.class.st b/src/BaselineOfHashtable/BaselineOfHashtable.class.st
index 4753ba0..3bfe68a 100644
--- a/src/BaselineOfHashtable/BaselineOfHashtable.class.st
+++ b/src/BaselineOfHashtable/BaselineOfHashtable.class.st
@@ -10,5 +10,16 @@ Class {
 { #category : #baseline }
 BaselineOfHashtable >> baseline: spec [
 	<baseline>
-	spec for: #common do: [ "Packages" spec package: 'Hashtable' ]
+	spec
+		for: #common
+		do: [
+			"Packages"
+			spec
+				package: 'Hashtable';
+				package: 'Hashtable-Tests' with: [ spec requires: #('Hashtable') ].
+				
+			"Groups"
+			spec
+				group: 'Core' with: #('Hashtable');
+				group: 'Tests' with: #('Hashtable-Tests') ]
 ]
diff --git a/src/Hashtable/DictionarySpeedTest.class.st b/src/Hashtable-Tests/DictionarySpeedTest.class.st
similarity index 99%
rename from src/Hashtable/DictionarySpeedTest.class.st
rename to src/Hashtable-Tests/DictionarySpeedTest.class.st
index 8ada19c..55016c6 100644
--- a/src/Hashtable/DictionarySpeedTest.class.st
+++ b/src/Hashtable-Tests/DictionarySpeedTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'stepsize',
 		'testsize'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #finding }
diff --git a/src/Hashtable/HashBagTest.class.st b/src/Hashtable-Tests/HashBagTest.class.st
similarity index 97%
rename from src/Hashtable/HashBagTest.class.st
rename to src/Hashtable-Tests/HashBagTest.class.st
index 18b2034..7d58fff 100644
--- a/src/Hashtable/HashBagTest.class.st
+++ b/src/Hashtable-Tests/HashBagTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'bag'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/HashSetTest.class.st b/src/Hashtable-Tests/HashSetTest.class.st
similarity index 98%
rename from src/Hashtable/HashSetTest.class.st
rename to src/Hashtable-Tests/HashSetTest.class.st
index 30eb08b..27150bc 100644
--- a/src/Hashtable/HashSetTest.class.st
+++ b/src/Hashtable-Tests/HashSetTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'set'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/src/Hashtable/HashTableTest.class.st b/src/Hashtable-Tests/HashTableTest.class.st
similarity index 99%
rename from src/Hashtable/HashTableTest.class.st
rename to src/Hashtable-Tests/HashTableTest.class.st
index 5c6f7b7..a9b3e8e 100644
--- a/src/Hashtable/HashTableTest.class.st
+++ b/src/Hashtable-Tests/HashTableTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'table',
 		'testsize'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/IdentityHashBagTest.class.st b/src/Hashtable-Tests/IdentityHashBagTest.class.st
similarity index 97%
rename from src/Hashtable/IdentityHashBagTest.class.st
rename to src/Hashtable-Tests/IdentityHashBagTest.class.st
index f10f46c..1df70c9 100644
--- a/src/Hashtable/IdentityHashBagTest.class.st
+++ b/src/Hashtable-Tests/IdentityHashBagTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'bag'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/IdentityHashSetTest.class.st b/src/Hashtable-Tests/IdentityHashSetTest.class.st
similarity index 97%
rename from src/Hashtable/IdentityHashSetTest.class.st
rename to src/Hashtable-Tests/IdentityHashSetTest.class.st
index 018e5e6..ead8f6b 100644
--- a/src/Hashtable/IdentityHashSetTest.class.st
+++ b/src/Hashtable-Tests/IdentityHashSetTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'set'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/IdentityHashTableTest.class.st b/src/Hashtable-Tests/IdentityHashTableTest.class.st
similarity index 98%
rename from src/Hashtable/IdentityHashTableTest.class.st
rename to src/Hashtable-Tests/IdentityHashTableTest.class.st
index d165c1e..7831896 100644
--- a/src/Hashtable/IdentityHashTableTest.class.st
+++ b/src/Hashtable-Tests/IdentityHashTableTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'table',
 		'testsize'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/WeakHashSetTest.class.st b/src/Hashtable-Tests/WeakHashSetTest.class.st
similarity index 95%
rename from src/Hashtable/WeakHashSetTest.class.st
rename to src/Hashtable-Tests/WeakHashSetTest.class.st
index c2bd48a..43b8301 100644
--- a/src/Hashtable/WeakHashSetTest.class.st
+++ b/src/Hashtable-Tests/WeakHashSetTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #WeakHashSetTest,
 	#superclass : #HashSetTest,
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/WeakKeyHashTableTest.class.st b/src/Hashtable-Tests/WeakKeyHashTableTest.class.st
similarity index 99%
rename from src/Hashtable/WeakKeyHashTableTest.class.st
rename to src/Hashtable-Tests/WeakKeyHashTableTest.class.st
index a148a53..96a9252 100644
--- a/src/Hashtable/WeakKeyHashTableTest.class.st
+++ b/src/Hashtable-Tests/WeakKeyHashTableTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'table',
 		'testsize'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable/WeakKeyIdentityHashTableTest.class.st b/src/Hashtable-Tests/WeakKeyIdentityHashTableTest.class.st
similarity index 99%
rename from src/Hashtable/WeakKeyIdentityHashTableTest.class.st
rename to src/Hashtable-Tests/WeakKeyIdentityHashTableTest.class.st
index d845781..465f4ca 100644
--- a/src/Hashtable/WeakKeyIdentityHashTableTest.class.st
+++ b/src/Hashtable-Tests/WeakKeyIdentityHashTableTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'table',
 		'testsize'
 	],
-	#category : #'Hashtable-Test'
+	#category : #'Hashtable-Tests'
 }
 
 { #category : #running }
diff --git a/src/Hashtable-Tests/package.st b/src/Hashtable-Tests/package.st
new file mode 100644
index 0000000..e854a86
--- /dev/null
+++ b/src/Hashtable-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : #'Hashtable-Tests' }