--- a/Make.spec	Tue Jun 28 21:16:36 2016 +0200
+++ b/Make.spec	Tue Jun 28 21:17:10 2016 +0200
@@ -96,7 +96,6 @@
 	ProjectDefinition \
 	ReadEvalPrintLoop \
 	RecursionLock \
-	Registry \
 	Semaphore \
 	SharedPool \
 	Signal \
@@ -115,7 +114,6 @@
 	Bag \
 	BlockContext \
 	BuiltinLookup \
-	CachingRegistry \
 	Character \
 	CharacterEncoderImplementations::ISO10646_1 \
 	CharacterEncoderImplementations::SingleByteEncoder \
@@ -127,7 +125,6 @@
 	ExternalFunction \
 	False \
 	FolderForProjectsDefinition \
-	HandleRegistry \
 	HashStream \
 	InlineObjectPrototype \
 	JavaPackage \
@@ -365,6 +362,7 @@
 	PrimitiveFailure \
 	RangeError \
 	ReadError \
+	Registry \
 	SignedByteArray \
 	StreamIOError \
 	StreamNotOpenError \
@@ -378,10 +376,12 @@
 	WrongProceedabilityError \
 	AbstractClassInstantiationError \
 	BadLiteralsError \
+	CachingRegistry \
 	DecodingError \
 	EncodingError \
 	FileDoesNotExistException \
 	FileStream \
+	HandleRegistry \
 	ImmutableString \
 	InvalidByteCodeError \
 	InvalidInstructionError \
@@ -474,7 +474,6 @@
     $(OUTDIR_SLASH)ProjectDefinition.$(O) \
     $(OUTDIR_SLASH)ReadEvalPrintLoop.$(O) \
     $(OUTDIR_SLASH)RecursionLock.$(O) \
-    $(OUTDIR_SLASH)Registry.$(O) \
     $(OUTDIR_SLASH)Semaphore.$(O) \
     $(OUTDIR_SLASH)SharedPool.$(O) \
     $(OUTDIR_SLASH)Signal.$(O) \
@@ -493,7 +492,6 @@
     $(OUTDIR_SLASH)Bag.$(O) \
     $(OUTDIR_SLASH)BlockContext.$(O) \
     $(OUTDIR_SLASH)BuiltinLookup.$(O) \
-    $(OUTDIR_SLASH)CachingRegistry.$(O) \
     $(OUTDIR_SLASH)Character.$(O) \
     $(OUTDIR_SLASH)CharacterEncoderImplementations__ISO10646_1.$(O) \
     $(OUTDIR_SLASH)CharacterEncoderImplementations__SingleByteEncoder.$(O) \
@@ -505,7 +503,6 @@
     $(OUTDIR_SLASH)ExternalFunction.$(O) \
     $(OUTDIR_SLASH)False.$(O) \
     $(OUTDIR_SLASH)FolderForProjectsDefinition.$(O) \
-    $(OUTDIR_SLASH)HandleRegistry.$(O) \
     $(OUTDIR_SLASH)HashStream.$(O) \
     $(OUTDIR_SLASH)InlineObjectPrototype.$(O) \
     $(OUTDIR_SLASH)JavaPackage.$(O) \
@@ -743,6 +740,7 @@
     $(OUTDIR_SLASH)PrimitiveFailure.$(O) \
     $(OUTDIR_SLASH)RangeError.$(O) \
     $(OUTDIR_SLASH)ReadError.$(O) \
+    $(OUTDIR_SLASH)Registry.$(O) \
     $(OUTDIR_SLASH)SignedByteArray.$(O) \
     $(OUTDIR_SLASH)StreamIOError.$(O) \
     $(OUTDIR_SLASH)StreamNotOpenError.$(O) \
@@ -756,10 +754,12 @@
     $(OUTDIR_SLASH)WrongProceedabilityError.$(O) \
     $(OUTDIR_SLASH)AbstractClassInstantiationError.$(O) \
     $(OUTDIR_SLASH)BadLiteralsError.$(O) \
+    $(OUTDIR_SLASH)CachingRegistry.$(O) \
     $(OUTDIR_SLASH)DecodingError.$(O) \
     $(OUTDIR_SLASH)EncodingError.$(O) \
     $(OUTDIR_SLASH)FileDoesNotExistException.$(O) \
     $(OUTDIR_SLASH)FileStream.$(O) \
+    $(OUTDIR_SLASH)HandleRegistry.$(O) \
     $(OUTDIR_SLASH)ImmutableString.$(O) \
     $(OUTDIR_SLASH)InvalidByteCodeError.$(O) \
     $(OUTDIR_SLASH)InvalidInstructionError.$(O) \