diff --git a/.project b/.project
new file mode 100644
index 0000000..81083cc
--- /dev/null
+++ b/.project
@@ -0,0 +1,3 @@
+{
+	'srcDirectory' : 'src'
+}
\ No newline at end of file
diff --git a/src/Units-Core/BaseUnit.class.st b/src/Units-Core/BaseUnit.class.st
index e531982..bd7754a 100644
--- a/src/Units-Core/BaseUnit.class.st
+++ b/src/Units-Core/BaseUnit.class.st
@@ -43,12 +43,6 @@ BaseUnit class >> ampere [
 	^self withSingularName: 'ampere'
 ]
 
-{ #category : #'base units' }
-BaseUnit class >> amperes [
-
-	^self ampere
-]
-
 { #category : #example }
 BaseUnit class >> basePair [
 
@@ -79,8 +73,14 @@ BaseUnit class >> donuts [
 	^ self donut
 ]
 
+{ #category : #'base units' }
+BaseUnit class >> gram [
+	^ self withSingularName: 'gram'
+]
+
 { #category : #initialization }
 BaseUnit class >> initializeClass [
+	<script>
 	"BaseUnit initializeClass."
 	"Do not rename this to #initialize."
 	PrintAbbreviated := false.  "may as well do it here ..."
@@ -88,7 +88,7 @@ BaseUnit class >> initializeClass [
 	SIUnitsByAbbreviation := Dictionary new.
 	SIUnitsByPluralName := Dictionary new.
 	self
-		addUnit: 'kilogram' plural: 'kilograms' abbreviation: 'kg';
+		addUnit: 'gram' plural: 'grams' abbreviation: 'g';
 		addUnit: 'metre' plural: 'metres' abbreviation: 'm';
 		addUnit: 'second' plural: 'seconds' abbreviation: 's';
 		addUnit: 'candela' plural: 'candela' abbreviation: 'cd';
@@ -107,78 +107,30 @@ BaseUnit class >> kelvin [
 	^self withSingularName: 'kelvin'
 ]
 
-{ #category : #'base units' }
-BaseUnit class >> kilogram [
-
-	^self withSingularName: 'kilogram'
-]
-
-{ #category : #'base units' }
-BaseUnit class >> kilograms [
-
-	^ self kilogram
-]
-
-{ #category : #'base units' }
-BaseUnit class >> meter [
-
-	^self metre
-]
-
-{ #category : #'base units' }
-BaseUnit class >> meters [
-
-	^self metre
-]
-
 { #category : #'base units' }
 BaseUnit class >> metre [
 
 	^self withSingularName: 'metre'
 ]
 
-{ #category : #'base units' }
-BaseUnit class >> metres [
-
-	^ self metre
-]
-
 { #category : #'base units' }
 BaseUnit class >> mole [
 
 	^self withSingularName: 'mole'
 ]
 
-{ #category : #'base units' }
-BaseUnit class >> moles [
-
-	^self mole
-]
-
 { #category : #'base units' }
 BaseUnit class >> second [
 
 	^self withSingularName: 'second'
 ]
 
-{ #category : #'base units' }
-BaseUnit class >> seconds [
-
-	^ self second
-]
-
 { #category : #'base units' }
 BaseUnit class >> volt [
 
 	^self withSingularName: 'volt'
 ]
 
-{ #category : #'base units' }
-BaseUnit class >> volts [
-
-	^self volt
-]
-
 { #category : #accessing }
 BaseUnit class >> withAbbreviation: abbreviation ifAbsent: exceptionBlock [
 	^SIUnitsByAbbreviation
diff --git a/src/Units-Core/Unit.class.st b/src/Units-Core/Unit.class.st
index 0692dd9..0eb8498 100644
--- a/src/Units-Core/Unit.class.st
+++ b/src/Units-Core/Unit.class.st
@@ -302,8 +302,7 @@ Unit class >> gigavolt [
 
 { #category : #'mass units' }
 Unit class >> gram [
-
-	^NamedUnit named: 'gram'
+	^ BaseUnit gram
 ]
 
 { #category : #'mass units' }
@@ -410,8 +409,7 @@ Unit class >> kg [
 
 { #category : #'mass units' }
 Unit class >> kilogram [
-
-	^ BaseUnit kilogram
+	^ self gram prefixedBy: 'kilo'
 ]
 
 { #category : #'mass units' }
@@ -890,7 +888,7 @@ Unit class >> volt [
 { #category : #'power units' }
 Unit class >> volts [
 
-	^ BaseUnit volts
+	^ self volt
 ]
 
 { #category : #'power units' }