--- a/compiler/Make.spec	Tue Aug 18 22:46:10 2015 +0100
+++ b/compiler/Make.spec	Mon Aug 24 15:56:20 2015 +0100
@@ -64,20 +64,17 @@
 	PPCASTUtilities \
 	PPCArguments \
 	PPCBridge \
+	PPCClass \
 	PPCClassBuilder \
 	PPCCodeBlock \
 	PPCCodeGen \
 	PPCCompilationError \
 	PPCCompilationWarning \
 	PPCCompiledMethod \
-	PPCCompiler \
-	PPCCompilerTokenErrorStrategy \
-	PPCCompilerTokenRememberStrategy \
-	PPCCompilerTokenizingErrorStrategy \
-	PPCCompilerTokenizingRememberStrategy \
 	PPCConfiguration \
 	PPCContext \
 	PPCContextMemento \
+	PPCDistinctScanner \
 	PPCGuard \
 	PPCIdGenerator \
 	PPCMethod \
@@ -86,6 +83,7 @@
 	PPCPluggableConfiguration \
 	PPCScanner \
 	PPCScannerCodeGenerator \
+	PPCScannerError \
 	PPCScannerResultStrategy \
 	PPCTokenGuard \
 	PPCompiledParser \
@@ -97,6 +95,7 @@
 	PEGFsaDeterminizator \
 	PEGFsaEpsilonTransition \
 	PEGFsaGenerator \
+	PEGFsaParserState \
 	PEGFsaPredicateTransition \
 	PEGFsaSequenceDeterminizator \
 	PEGFsaUncopiableState \
@@ -109,22 +108,25 @@
 	PPCDistinctResultStrategy \
 	PPCEndOfFileNode \
 	PPCFSACodeGen \
+	PPCFSAVisitor \
 	PPCInlinedMethod \
 	PPCInliningVisitor \
 	PPCListNode \
 	PPCNilNode \
+	PPCNoResultStrategy \
 	PPCPluggableNode \
 	PPCProfilingContext \
 	PPCRewritingVisitor \
 	PPCTokenCodeGenerator \
 	PPCTokenizingCodeGen \
-	PPCTokenizingCompiler \
 	PPCTokenizingConfiguration \
+	PPCUniversalCodeGen \
 	PPCUniversalConfiguration \
 	PPCUniversalResultStrategy \
 	PPCUnknownNode \
 	PPTokenizingCompiledParser \
 	PEGFsaEOFTransition \
+	PEGFsaParserTransition \
 	PPCAbstractActionNode \
 	PPCAndNode \
 	PPCCharSetPredicateNode \
@@ -161,6 +163,7 @@
 	PPCTokenizingParserNode \
 	PPCTokenizingVisitor \
 	PPCTrimmingTokenNode \
+	PPCUniversalCodeGenerator \
 	PPCActionNode \
 	PPCDeterministicChoiceNode \
 	PPCRecognizingSequenceNode \
@@ -192,20 +195,17 @@
     $(OUTDIR_SLASH)PPCASTUtilities.$(O) \
     $(OUTDIR_SLASH)PPCArguments.$(O) \
     $(OUTDIR_SLASH)PPCBridge.$(O) \
+    $(OUTDIR_SLASH)PPCClass.$(O) \
     $(OUTDIR_SLASH)PPCClassBuilder.$(O) \
     $(OUTDIR_SLASH)PPCCodeBlock.$(O) \
     $(OUTDIR_SLASH)PPCCodeGen.$(O) \
     $(OUTDIR_SLASH)PPCCompilationError.$(O) \
     $(OUTDIR_SLASH)PPCCompilationWarning.$(O) \
     $(OUTDIR_SLASH)PPCCompiledMethod.$(O) \
-    $(OUTDIR_SLASH)PPCCompiler.$(O) \
-    $(OUTDIR_SLASH)PPCCompilerTokenErrorStrategy.$(O) \
-    $(OUTDIR_SLASH)PPCCompilerTokenRememberStrategy.$(O) \
-    $(OUTDIR_SLASH)PPCCompilerTokenizingErrorStrategy.$(O) \
-    $(OUTDIR_SLASH)PPCCompilerTokenizingRememberStrategy.$(O) \
     $(OUTDIR_SLASH)PPCConfiguration.$(O) \
     $(OUTDIR_SLASH)PPCContext.$(O) \
     $(OUTDIR_SLASH)PPCContextMemento.$(O) \
+    $(OUTDIR_SLASH)PPCDistinctScanner.$(O) \
     $(OUTDIR_SLASH)PPCGuard.$(O) \
     $(OUTDIR_SLASH)PPCIdGenerator.$(O) \
     $(OUTDIR_SLASH)PPCMethod.$(O) \
@@ -214,6 +214,7 @@
     $(OUTDIR_SLASH)PPCPluggableConfiguration.$(O) \
     $(OUTDIR_SLASH)PPCScanner.$(O) \
     $(OUTDIR_SLASH)PPCScannerCodeGenerator.$(O) \
+    $(OUTDIR_SLASH)PPCScannerError.$(O) \
     $(OUTDIR_SLASH)PPCScannerResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCTokenGuard.$(O) \
     $(OUTDIR_SLASH)PPCompiledParser.$(O) \
@@ -225,6 +226,7 @@
     $(OUTDIR_SLASH)PEGFsaDeterminizator.$(O) \
     $(OUTDIR_SLASH)PEGFsaEpsilonTransition.$(O) \
     $(OUTDIR_SLASH)PEGFsaGenerator.$(O) \
+    $(OUTDIR_SLASH)PEGFsaParserState.$(O) \
     $(OUTDIR_SLASH)PEGFsaPredicateTransition.$(O) \
     $(OUTDIR_SLASH)PEGFsaSequenceDeterminizator.$(O) \
     $(OUTDIR_SLASH)PEGFsaUncopiableState.$(O) \
@@ -237,22 +239,25 @@
     $(OUTDIR_SLASH)PPCDistinctResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCEndOfFileNode.$(O) \
     $(OUTDIR_SLASH)PPCFSACodeGen.$(O) \
+    $(OUTDIR_SLASH)PPCFSAVisitor.$(O) \
     $(OUTDIR_SLASH)PPCInlinedMethod.$(O) \
     $(OUTDIR_SLASH)PPCInliningVisitor.$(O) \
     $(OUTDIR_SLASH)PPCListNode.$(O) \
     $(OUTDIR_SLASH)PPCNilNode.$(O) \
+    $(OUTDIR_SLASH)PPCNoResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCPluggableNode.$(O) \
     $(OUTDIR_SLASH)PPCProfilingContext.$(O) \
     $(OUTDIR_SLASH)PPCRewritingVisitor.$(O) \
     $(OUTDIR_SLASH)PPCTokenCodeGenerator.$(O) \
     $(OUTDIR_SLASH)PPCTokenizingCodeGen.$(O) \
-    $(OUTDIR_SLASH)PPCTokenizingCompiler.$(O) \
     $(OUTDIR_SLASH)PPCTokenizingConfiguration.$(O) \
+    $(OUTDIR_SLASH)PPCUniversalCodeGen.$(O) \
     $(OUTDIR_SLASH)PPCUniversalConfiguration.$(O) \
     $(OUTDIR_SLASH)PPCUniversalResultStrategy.$(O) \
     $(OUTDIR_SLASH)PPCUnknownNode.$(O) \
     $(OUTDIR_SLASH)PPTokenizingCompiledParser.$(O) \
     $(OUTDIR_SLASH)PEGFsaEOFTransition.$(O) \
+    $(OUTDIR_SLASH)PEGFsaParserTransition.$(O) \
     $(OUTDIR_SLASH)PPCAbstractActionNode.$(O) \
     $(OUTDIR_SLASH)PPCAndNode.$(O) \
     $(OUTDIR_SLASH)PPCCharSetPredicateNode.$(O) \
@@ -289,6 +294,7 @@
     $(OUTDIR_SLASH)PPCTokenizingParserNode.$(O) \
     $(OUTDIR_SLASH)PPCTokenizingVisitor.$(O) \
     $(OUTDIR_SLASH)PPCTrimmingTokenNode.$(O) \
+    $(OUTDIR_SLASH)PPCUniversalCodeGenerator.$(O) \
     $(OUTDIR_SLASH)PPCActionNode.$(O) \
     $(OUTDIR_SLASH)PPCDeterministicChoiceNode.$(O) \
     $(OUTDIR_SLASH)PPCRecognizingSequenceNode.$(O) \