diff --git a/Android.bp b/Android.bp index add343c8ced51a98e9c45ec4656c88136643c8f0..c51b357cbcefdb2170f7771738f4cd16904b0417 100644 --- a/Android.bp +++ b/Android.bp @@ -14,9 +14,9 @@ java_library_host { name: "antlr-runtime", - srcs: ["antlr-3.4/runtime/Java/src/main/java/**/*.java"], + srcs: ["runtime/Java/src/main/java/**/*.java"], //Remove DOTTreeGenerator.java, so that we don't have the StringTemplate library as a dependency - exclude_srcs: ["antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java"], + exclude_srcs: ["runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java"], errorprone: { javacflags: ["-Xep:MissingOverride:OFF"], // b/73499927 }, diff --git a/antlr-3.4/BUILD.txt b/BUILD.txt similarity index 100% rename from antlr-3.4/BUILD.txt rename to BUILD.txt diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/Readme.txt b/antlr-ant/main/antlr3-task/Readme.txt similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/Readme.txt rename to antlr-ant/main/antlr3-task/Readme.txt diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/ANTLR3.java b/antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/ANTLR3.java similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/ANTLR3.java rename to antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/ANTLR3.java diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/antlib.xml b/antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/antlib.xml similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/antlib.xml rename to antlr-ant/main/antlr3-task/antlr3-src/org/apache/tools/ant/antlr/antlib.xml diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/antlr3-task.doc b/antlr-ant/main/antlr3-task/antlr3-task.doc similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/antlr3-task.doc rename to antlr-ant/main/antlr3-task/antlr3-task.doc diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/antlr3-task.htm b/antlr-ant/main/antlr3-task/antlr3-task.htm similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/antlr3-task.htm rename to antlr-ant/main/antlr3-task/antlr3-task.htm diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/antlr3.jar b/antlr-ant/main/antlr3-task/antlr3.jar similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/antlr3.jar rename to antlr-ant/main/antlr3-task/antlr3.jar diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/composite-java_build.zip b/antlr-ant/main/antlr3-task/composite-java_build.zip similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/composite-java_build.zip rename to antlr-ant/main/antlr3-task/composite-java_build.zip diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/composite-netbeans.zip b/antlr-ant/main/antlr3-task/composite-netbeans.zip similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/composite-netbeans.zip rename to antlr-ant/main/antlr3-task/composite-netbeans.zip diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/d2u.zip b/antlr-ant/main/antlr3-task/d2u.zip similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/d2u.zip rename to antlr-ant/main/antlr3-task/d2u.zip diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/polydiff-netbeans.zip b/antlr-ant/main/antlr3-task/polydiff-netbeans.zip similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/polydiff-netbeans.zip rename to antlr-ant/main/antlr3-task/polydiff-netbeans.zip diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/polydiff_build.zip b/antlr-ant/main/antlr3-task/polydiff_build.zip similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/polydiff_build.zip rename to antlr-ant/main/antlr3-task/polydiff_build.zip diff --git a/antlr-3.4/antlr-ant/main/antlr3-task/simplecTreeParser.zip b/antlr-ant/main/antlr3-task/simplecTreeParser.zip similarity index 100% rename from antlr-3.4/antlr-ant/main/antlr3-task/simplecTreeParser.zip rename to antlr-ant/main/antlr3-task/simplecTreeParser.zip diff --git a/antlr-3.4/antlr.config b/antlr.config similarity index 100% rename from antlr-3.4/antlr.config rename to antlr.config diff --git a/antlr-3.4/antlr3-maven-archetype/antlr.config b/antlr3-maven-archetype/antlr.config similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/antlr.config rename to antlr3-maven-archetype/antlr.config diff --git a/antlr-3.4/antlr3-maven-archetype/pom.xml b/antlr3-maven-archetype/pom.xml similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/pom.xml rename to antlr3-maven-archetype/pom.xml diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml rename to antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype.xml b/antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype.xml similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype.xml rename to antlr3-maven-archetype/src/main/resources/META-INF/maven/archetype.xml diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml b/antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml rename to antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TLexer.g b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TLexer.g similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TLexer.g rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TLexer.g diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TParser.g b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TParser.g similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TParser.g rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TParser.g diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TTree.g b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TTree.g similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TTree.g rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/TTree.g diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/imports/Ruleb.g b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/imports/Ruleb.g similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/imports/Ruleb.g rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/antlr3/imports/Ruleb.g diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTLexer.java b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTLexer.java similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTLexer.java rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTLexer.java diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTParser.java b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTParser.java similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTParser.java rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/AbstractTParser.java diff --git a/antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/Main.java b/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/Main.java similarity index 100% rename from antlr-3.4/antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/Main.java rename to antlr3-maven-archetype/src/main/resources/archetype-resources/src/main/java/Main.java diff --git a/antlr-3.4/antlr3-maven-plugin/pom.xml b/antlr3-maven-plugin/pom.xml similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/pom.xml rename to antlr3-maven-plugin/pom.xml diff --git a/antlr-3.4/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3ErrorLog.java b/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3ErrorLog.java similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3ErrorLog.java rename to antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3ErrorLog.java diff --git a/antlr-3.4/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java b/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java rename to antlr3-maven-plugin/src/main/java/org/antlr/mojo/antlr3/Antlr3Mojo.java diff --git a/antlr-3.4/antlr3-maven-plugin/src/site/apt/examples/import.apt b/antlr3-maven-plugin/src/site/apt/examples/import.apt similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/site/apt/examples/import.apt rename to antlr3-maven-plugin/src/site/apt/examples/import.apt diff --git a/antlr-3.4/antlr3-maven-plugin/src/site/apt/examples/libraries.apt b/antlr3-maven-plugin/src/site/apt/examples/libraries.apt similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/site/apt/examples/libraries.apt rename to antlr3-maven-plugin/src/site/apt/examples/libraries.apt diff --git a/antlr-3.4/antlr3-maven-plugin/src/site/apt/examples/simple.apt b/antlr3-maven-plugin/src/site/apt/examples/simple.apt similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/site/apt/examples/simple.apt rename to antlr3-maven-plugin/src/site/apt/examples/simple.apt diff --git a/antlr-3.4/antlr3-maven-plugin/src/site/apt/index.apt b/antlr3-maven-plugin/src/site/apt/index.apt similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/site/apt/index.apt rename to antlr3-maven-plugin/src/site/apt/index.apt diff --git a/antlr-3.4/antlr3-maven-plugin/src/site/apt/usage.apt.vm b/antlr3-maven-plugin/src/site/apt/usage.apt.vm similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/site/apt/usage.apt.vm rename to antlr3-maven-plugin/src/site/apt/usage.apt.vm diff --git a/antlr-3.4/antlr3-maven-plugin/src/site/site.xml b/antlr3-maven-plugin/src/site/site.xml similarity index 100% rename from antlr-3.4/antlr3-maven-plugin/src/site/site.xml rename to antlr3-maven-plugin/src/site/site.xml diff --git a/antlr-3.4/antlrjar.xml b/antlrjar.xml similarity index 100% rename from antlr-3.4/antlrjar.xml rename to antlrjar.xml diff --git a/antlr-3.4/antlrsources.xml b/antlrsources.xml similarity index 100% rename from antlr-3.4/antlrsources.xml rename to antlrsources.xml diff --git a/antlr-3.4/gunit-maven-plugin/pom.xml b/gunit-maven-plugin/pom.xml similarity index 100% rename from antlr-3.4/gunit-maven-plugin/pom.xml rename to gunit-maven-plugin/pom.xml diff --git a/antlr-3.4/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java b/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java similarity index 100% rename from antlr-3.4/gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java rename to gunit-maven-plugin/src/main/java/org/antlr/mojo/antlr3/GUnitExecuteMojo.java diff --git a/antlr-3.4/gunit/CHANGES.txt b/gunit/CHANGES.txt similarity index 100% rename from antlr-3.4/gunit/CHANGES.txt rename to gunit/CHANGES.txt diff --git a/antlr-3.4/gunit/LICENSE.txt b/gunit/LICENSE.txt similarity index 100% rename from antlr-3.4/gunit/LICENSE.txt rename to gunit/LICENSE.txt diff --git a/antlr-3.4/gunit/README.txt b/gunit/README.txt similarity index 100% rename from antlr-3.4/gunit/README.txt rename to gunit/README.txt diff --git a/antlr-3.4/gunit/antlr.config b/gunit/antlr.config similarity index 100% rename from antlr-3.4/gunit/antlr.config rename to gunit/antlr.config diff --git a/antlr-3.4/gunit/pom.xml b/gunit/pom.xml similarity index 100% rename from antlr-3.4/gunit/pom.xml rename to gunit/pom.xml diff --git a/antlr-3.4/gunit/src/main/antlr3/org/antlr/gunit/gUnit.g b/gunit/src/main/antlr3/org/antlr/gunit/gUnit.g similarity index 100% rename from antlr-3.4/gunit/src/main/antlr3/org/antlr/gunit/gUnit.g rename to gunit/src/main/antlr3/org/antlr/gunit/gUnit.g diff --git a/antlr-3.4/gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/ANTLRv3.g b/gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/ANTLRv3.g similarity index 100% rename from antlr-3.4/gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/ANTLRv3.g rename to gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/ANTLRv3.g diff --git a/antlr-3.4/gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/StGUnit.g b/gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/StGUnit.g similarity index 100% rename from antlr-3.4/gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/StGUnit.g rename to gunit/src/main/antlr3/org/antlr/gunit/swingui/parsers/StGUnit.g diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/AbstractTest.java b/gunit/src/main/java/org/antlr/gunit/AbstractTest.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/AbstractTest.java rename to gunit/src/main/java/org/antlr/gunit/AbstractTest.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/BooleanTest.java b/gunit/src/main/java/org/antlr/gunit/BooleanTest.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/BooleanTest.java rename to gunit/src/main/java/org/antlr/gunit/BooleanTest.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/GrammarInfo.java b/gunit/src/main/java/org/antlr/gunit/GrammarInfo.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/GrammarInfo.java rename to gunit/src/main/java/org/antlr/gunit/GrammarInfo.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/ITestCase.java b/gunit/src/main/java/org/antlr/gunit/ITestCase.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/ITestCase.java rename to gunit/src/main/java/org/antlr/gunit/ITestCase.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/ITestSuite.java b/gunit/src/main/java/org/antlr/gunit/ITestSuite.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/ITestSuite.java rename to gunit/src/main/java/org/antlr/gunit/ITestSuite.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/Interp.java b/gunit/src/main/java/org/antlr/gunit/Interp.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/Interp.java rename to gunit/src/main/java/org/antlr/gunit/Interp.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/InvalidInputException.java b/gunit/src/main/java/org/antlr/gunit/InvalidInputException.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/InvalidInputException.java rename to gunit/src/main/java/org/antlr/gunit/InvalidInputException.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/JUnitCodeGen.java b/gunit/src/main/java/org/antlr/gunit/JUnitCodeGen.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/JUnitCodeGen.java rename to gunit/src/main/java/org/antlr/gunit/JUnitCodeGen.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/OutputTest.java b/gunit/src/main/java/org/antlr/gunit/OutputTest.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/OutputTest.java rename to gunit/src/main/java/org/antlr/gunit/OutputTest.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/ReturnTest.java b/gunit/src/main/java/org/antlr/gunit/ReturnTest.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/ReturnTest.java rename to gunit/src/main/java/org/antlr/gunit/ReturnTest.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitBaseTest.java b/gunit/src/main/java/org/antlr/gunit/gUnitBaseTest.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitBaseTest.java rename to gunit/src/main/java/org/antlr/gunit/gUnitBaseTest.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitExecutor.java b/gunit/src/main/java/org/antlr/gunit/gUnitExecutor.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitExecutor.java rename to gunit/src/main/java/org/antlr/gunit/gUnitExecutor.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitTestInput.java b/gunit/src/main/java/org/antlr/gunit/gUnitTestInput.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitTestInput.java rename to gunit/src/main/java/org/antlr/gunit/gUnitTestInput.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitTestResult.java b/gunit/src/main/java/org/antlr/gunit/gUnitTestResult.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitTestResult.java rename to gunit/src/main/java/org/antlr/gunit/gUnitTestResult.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitTestSuite.java b/gunit/src/main/java/org/antlr/gunit/gUnitTestSuite.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/gUnitTestSuite.java rename to gunit/src/main/java/org/antlr/gunit/gUnitTestSuite.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/AbstractInputEditor.java b/gunit/src/main/java/org/antlr/gunit/swingui/AbstractInputEditor.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/AbstractInputEditor.java rename to gunit/src/main/java/org/antlr/gunit/swingui/AbstractInputEditor.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/IController.java b/gunit/src/main/java/org/antlr/gunit/swingui/IController.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/IController.java rename to gunit/src/main/java/org/antlr/gunit/swingui/IController.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/ImageFactory.java b/gunit/src/main/java/org/antlr/gunit/swingui/ImageFactory.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/ImageFactory.java rename to gunit/src/main/java/org/antlr/gunit/swingui/ImageFactory.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/RuleListController.java b/gunit/src/main/java/org/antlr/gunit/swingui/RuleListController.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/RuleListController.java rename to gunit/src/main/java/org/antlr/gunit/swingui/RuleListController.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/RunnerController.java b/gunit/src/main/java/org/antlr/gunit/swingui/RunnerController.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/RunnerController.java rename to gunit/src/main/java/org/antlr/gunit/swingui/RunnerController.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/StatusBarController.java b/gunit/src/main/java/org/antlr/gunit/swingui/StatusBarController.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/StatusBarController.java rename to gunit/src/main/java/org/antlr/gunit/swingui/StatusBarController.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/TestCaseEditController.java b/gunit/src/main/java/org/antlr/gunit/swingui/TestCaseEditController.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/TestCaseEditController.java rename to gunit/src/main/java/org/antlr/gunit/swingui/TestCaseEditController.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/Tool.java b/gunit/src/main/java/org/antlr/gunit/swingui/Tool.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/Tool.java rename to gunit/src/main/java/org/antlr/gunit/swingui/Tool.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceController.java b/gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceController.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceController.java rename to gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceController.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceView.java b/gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceView.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceView.java rename to gunit/src/main/java/org/antlr/gunit/swingui/WorkSpaceView.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseInput.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseInput.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseInput.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseInput.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseOutput.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseOutput.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseOutput.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/ITestCaseOutput.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/Rule.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/Rule.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/Rule.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/Rule.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCase.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCase.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCase.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCase.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputFile.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputFile.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputFile.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputFile.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputMultiString.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputMultiString.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputMultiString.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputMultiString.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputString.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputString.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputString.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseInputString.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputAST.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputAST.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputAST.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputAST.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputResult.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputResult.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputResult.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputResult.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputReturn.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputReturn.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputReturn.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputReturn.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputStdOut.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputStdOut.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputStdOut.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestCaseOutputStdOut.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuite.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuite.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuite.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuite.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuiteFactory.java b/gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuiteFactory.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuiteFactory.java rename to gunit/src/main/java/org/antlr/gunit/swingui/model/TestSuiteFactory.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/NotifiedTestExecuter.java b/gunit/src/main/java/org/antlr/gunit/swingui/runner/NotifiedTestExecuter.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/NotifiedTestExecuter.java rename to gunit/src/main/java/org/antlr/gunit/swingui/runner/NotifiedTestExecuter.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/ParserLoader.java b/gunit/src/main/java/org/antlr/gunit/swingui/runner/ParserLoader.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/ParserLoader.java rename to gunit/src/main/java/org/antlr/gunit/swingui/runner/ParserLoader.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/TestSuiteAdapter.java b/gunit/src/main/java/org/antlr/gunit/swingui/runner/TestSuiteAdapter.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/TestSuiteAdapter.java rename to gunit/src/main/java/org/antlr/gunit/swingui/runner/TestSuiteAdapter.java diff --git a/antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/gUnitAdapter.java b/gunit/src/main/java/org/antlr/gunit/swingui/runner/gUnitAdapter.java similarity index 100% rename from antlr-3.4/gunit/src/main/java/org/antlr/gunit/swingui/runner/gUnitAdapter.java rename to gunit/src/main/java/org/antlr/gunit/swingui/runner/gUnitAdapter.java diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/gUnitTestResult.stg b/gunit/src/main/resources/org/antlr/gunit/gUnitTestResult.stg similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/gUnitTestResult.stg rename to gunit/src/main/resources/org/antlr/gunit/gUnitTestResult.stg diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/junit.stg b/gunit/src/main/resources/org/antlr/gunit/junit.stg similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/junit.stg rename to gunit/src/main/resources/org/antlr/gunit/junit.stg diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/gunit.stg b/gunit/src/main/resources/org/antlr/gunit/swingui/gunit.stg similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/gunit.stg rename to gunit/src/main/resources/org/antlr/gunit/swingui/gunit.stg diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/accept.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/accept.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/accept.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/accept.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/add.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/add.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/add.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/add.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/addfile24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/addfile24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/addfile24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/addfile24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/delete24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/delete24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/delete24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/delete24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/edit16.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/edit16.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/edit16.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/edit16.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/favb16.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/favb16.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/favb16.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/favb16.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/favb24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/favb24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/favb24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/favb24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/file16.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/file16.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/file16.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/file16.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/filesearch24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/filesearch24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/filesearch24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/filesearch24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/floppy24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/floppy24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/floppy24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/floppy24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/folder24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/folder24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/folder24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/folder24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/help24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/help24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/help24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/help24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/next24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/next24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/next24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/next24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/redo24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/redo24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/redo24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/redo24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/refresh24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/refresh24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/refresh24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/refresh24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/runfail.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/runfail.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/runfail.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/runfail.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/runpass.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/runpass.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/runpass.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/runpass.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/saveas24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/saveas24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/saveas24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/saveas24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroup.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroup.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroup.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroup.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroupx.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroupx.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroupx.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/testgroupx.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/testsuite.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/testsuite.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/testsuite.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/testsuite.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile16.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile16.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile16.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile16.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/textfile24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/undo24.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/undo24.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/undo24.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/undo24.png diff --git a/antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/windowb16.png b/gunit/src/main/resources/org/antlr/gunit/swingui/images/windowb16.png similarity index 100% rename from antlr-3.4/gunit/src/main/resources/org/antlr/gunit/swingui/images/windowb16.png rename to gunit/src/main/resources/org/antlr/gunit/swingui/images/windowb16.png diff --git a/antlr-3.4/gunit/src/test/java/org/antlr/gunit/GunitTest.java b/gunit/src/test/java/org/antlr/gunit/GunitTest.java similarity index 100% rename from antlr-3.4/gunit/src/test/java/org/antlr/gunit/GunitTest.java rename to gunit/src/test/java/org/antlr/gunit/GunitTest.java diff --git a/antlr-3.4/lib/antlr-3.4-complete.jar b/lib/antlr-3.4-complete.jar similarity index 100% rename from antlr-3.4/lib/antlr-3.4-complete.jar rename to lib/antlr-3.4-complete.jar diff --git a/antlr-3.4/pom.xml b/pom.xml similarity index 100% rename from antlr-3.4/pom.xml rename to pom.xml diff --git a/antlr-3.4/runtime/ActionScript/AUTHORS b/runtime/ActionScript/AUTHORS similarity index 100% rename from antlr-3.4/runtime/ActionScript/AUTHORS rename to runtime/ActionScript/AUTHORS diff --git a/antlr-3.4/runtime/ActionScript/LICENSE b/runtime/ActionScript/LICENSE similarity index 100% rename from antlr-3.4/runtime/ActionScript/LICENSE rename to runtime/ActionScript/LICENSE diff --git a/antlr-3.4/runtime/ActionScript/README b/runtime/ActionScript/README similarity index 100% rename from antlr-3.4/runtime/ActionScript/README rename to runtime/ActionScript/README diff --git a/antlr-3.4/runtime/ActionScript/lib/antlr3.swc b/runtime/ActionScript/lib/antlr3.swc similarity index 100% rename from antlr-3.4/runtime/ActionScript/lib/antlr3.swc rename to runtime/ActionScript/lib/antlr3.swc diff --git a/antlr-3.4/runtime/ActionScript/project/.actionScriptProperties b/runtime/ActionScript/project/.actionScriptProperties similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/.actionScriptProperties rename to runtime/ActionScript/project/.actionScriptProperties diff --git a/antlr-3.4/runtime/ActionScript/project/.flexLibProperties b/runtime/ActionScript/project/.flexLibProperties similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/.flexLibProperties rename to runtime/ActionScript/project/.flexLibProperties diff --git a/antlr-3.4/runtime/ActionScript/project/.project b/runtime/ActionScript/project/.project similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/.project rename to runtime/ActionScript/project/.project diff --git a/antlr-3.4/runtime/ActionScript/project/.settings/org.eclipse.core.resources.prefs b/runtime/ActionScript/project/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/.settings/org.eclipse.core.resources.prefs rename to runtime/ActionScript/project/.settings/org.eclipse.core.resources.prefs diff --git a/antlr-3.4/runtime/ActionScript/project/README.txt b/runtime/ActionScript/project/README.txt similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/README.txt rename to runtime/ActionScript/project/README.txt diff --git a/antlr-3.4/runtime/ActionScript/project/build.xml b/runtime/ActionScript/project/build.xml similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/build.xml rename to runtime/ActionScript/project/build.xml diff --git a/antlr-3.4/runtime/ActionScript/project/lib/FlexAntTasks.jar b/runtime/ActionScript/project/lib/FlexAntTasks.jar similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/lib/FlexAntTasks.jar rename to runtime/ActionScript/project/lib/FlexAntTasks.jar diff --git a/antlr-3.4/runtime/ActionScript/project/lib/FlexUnitOptional.swc b/runtime/ActionScript/project/lib/FlexUnitOptional.swc similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/lib/FlexUnitOptional.swc rename to runtime/ActionScript/project/lib/FlexUnitOptional.swc diff --git a/antlr-3.4/runtime/ActionScript/project/lib/flexunit.swc b/runtime/ActionScript/project/lib/flexunit.swc similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/lib/flexunit.swc rename to runtime/ActionScript/project/lib/flexunit.swc diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/ANTLRFileStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/ANTLRFileStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/ANTLRFileStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/ANTLRFileStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/ANTLRStringStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/ANTLRStringStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/ANTLRStringStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/ANTLRStringStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/BaseRecognizer.as b/runtime/ActionScript/project/src/org/antlr/runtime/BaseRecognizer.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/BaseRecognizer.as rename to runtime/ActionScript/project/src/org/antlr/runtime/BaseRecognizer.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/BitSet.as b/runtime/ActionScript/project/src/org/antlr/runtime/BitSet.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/BitSet.as rename to runtime/ActionScript/project/src/org/antlr/runtime/BitSet.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CharStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/CharStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CharStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/CharStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CharStreamConstants.as b/runtime/ActionScript/project/src/org/antlr/runtime/CharStreamConstants.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CharStreamConstants.as rename to runtime/ActionScript/project/src/org/antlr/runtime/CharStreamConstants.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CharStreamState.as b/runtime/ActionScript/project/src/org/antlr/runtime/CharStreamState.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CharStreamState.as rename to runtime/ActionScript/project/src/org/antlr/runtime/CharStreamState.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CommonToken.as b/runtime/ActionScript/project/src/org/antlr/runtime/CommonToken.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CommonToken.as rename to runtime/ActionScript/project/src/org/antlr/runtime/CommonToken.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CommonTokenStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/CommonTokenStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/CommonTokenStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/CommonTokenStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/DFA.as b/runtime/ActionScript/project/src/org/antlr/runtime/DFA.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/DFA.as rename to runtime/ActionScript/project/src/org/antlr/runtime/DFA.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/EarlyExitException.as b/runtime/ActionScript/project/src/org/antlr/runtime/EarlyExitException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/EarlyExitException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/EarlyExitException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/FailedPredicateException.as b/runtime/ActionScript/project/src/org/antlr/runtime/FailedPredicateException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/FailedPredicateException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/FailedPredicateException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/IntStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/IntStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/IntStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/IntStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/Lexer.as b/runtime/ActionScript/project/src/org/antlr/runtime/Lexer.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/Lexer.as rename to runtime/ActionScript/project/src/org/antlr/runtime/Lexer.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedNotSetException.as b/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedNotSetException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedNotSetException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/MismatchedNotSetException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedRangeException.as b/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedRangeException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedRangeException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/MismatchedRangeException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedSetException.as b/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedSetException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedSetException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/MismatchedSetException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTokenException.as b/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTokenException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTokenException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTokenException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTreeNodeException.as b/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTreeNodeException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTreeNodeException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/MismatchedTreeNodeException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MissingTokenException.as b/runtime/ActionScript/project/src/org/antlr/runtime/MissingTokenException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/MissingTokenException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/MissingTokenException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/NoViableAltException.as b/runtime/ActionScript/project/src/org/antlr/runtime/NoViableAltException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/NoViableAltException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/NoViableAltException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/Parser.as b/runtime/ActionScript/project/src/org/antlr/runtime/Parser.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/Parser.as rename to runtime/ActionScript/project/src/org/antlr/runtime/Parser.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/ParserRuleReturnScope.as b/runtime/ActionScript/project/src/org/antlr/runtime/ParserRuleReturnScope.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/ParserRuleReturnScope.as rename to runtime/ActionScript/project/src/org/antlr/runtime/ParserRuleReturnScope.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/RecognitionException.as b/runtime/ActionScript/project/src/org/antlr/runtime/RecognitionException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/RecognitionException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/RecognitionException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/RecognizerSharedState.as b/runtime/ActionScript/project/src/org/antlr/runtime/RecognizerSharedState.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/RecognizerSharedState.as rename to runtime/ActionScript/project/src/org/antlr/runtime/RecognizerSharedState.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/RuleReturnScope.as b/runtime/ActionScript/project/src/org/antlr/runtime/RuleReturnScope.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/RuleReturnScope.as rename to runtime/ActionScript/project/src/org/antlr/runtime/RuleReturnScope.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/Token.as b/runtime/ActionScript/project/src/org/antlr/runtime/Token.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/Token.as rename to runtime/ActionScript/project/src/org/antlr/runtime/Token.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenConstants.as b/runtime/ActionScript/project/src/org/antlr/runtime/TokenConstants.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenConstants.as rename to runtime/ActionScript/project/src/org/antlr/runtime/TokenConstants.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenRewriteStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/TokenRewriteStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenRewriteStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/TokenRewriteStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenSource.as b/runtime/ActionScript/project/src/org/antlr/runtime/TokenSource.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenSource.as rename to runtime/ActionScript/project/src/org/antlr/runtime/TokenSource.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/TokenStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/TokenStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/TokenStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/UnwantedTokenException.as b/runtime/ActionScript/project/src/org/antlr/runtime/UnwantedTokenException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/UnwantedTokenException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/UnwantedTokenException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTree.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTree.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTree.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTree.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTreeAdaptor.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTreeAdaptor.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTreeAdaptor.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/BaseTreeAdaptor.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonErrorNode.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonErrorNode.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonErrorNode.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonErrorNode.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTree.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTree.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTree.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTree.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeAdaptor.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeAdaptor.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeAdaptor.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeAdaptor.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeNodeStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeNodeStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeNodeStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/CommonTreeNodeStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteCardinalityException.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteCardinalityException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteCardinalityException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteCardinalityException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEarlyExitException.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEarlyExitException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEarlyExitException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEarlyExitException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEmptyStreamException.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEmptyStreamException.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEmptyStreamException.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteEmptyStreamException.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleElementStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleElementStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleElementStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleElementStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleNodeStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleNodeStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleNodeStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleNodeStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleTokenStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleTokenStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleTokenStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/RewriteRuleTokenStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/Tree.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/Tree.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/Tree.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/Tree.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeAdaptor.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeAdaptor.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeAdaptor.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeAdaptor.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeConstants.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeConstants.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeConstants.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeConstants.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeNodeStream.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeNodeStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeNodeStream.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeNodeStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeParser.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeParser.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeParser.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeParser.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeRuleReturnScope.as b/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeRuleReturnScope.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeRuleReturnScope.as rename to runtime/ActionScript/project/src/org/antlr/runtime/tree/TreeRuleReturnScope.as diff --git a/antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/version.as b/runtime/ActionScript/project/src/org/antlr/runtime/version.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/src/org/antlr/runtime/version.as rename to runtime/ActionScript/project/src/org/antlr/runtime/version.as diff --git a/antlr-3.4/runtime/ActionScript/project/test/Antlr3Test.mxml b/runtime/ActionScript/project/test/Antlr3Test.mxml similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/test/Antlr3Test.mxml rename to runtime/ActionScript/project/test/Antlr3Test.mxml diff --git a/antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/AllTests.as b/runtime/ActionScript/project/test/org/antlr/runtime/test/AllTests.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/AllTests.as rename to runtime/ActionScript/project/test/org/antlr/runtime/test/AllTests.as diff --git a/antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/TestANTLRStringStream.as b/runtime/ActionScript/project/test/org/antlr/runtime/test/TestANTLRStringStream.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/TestANTLRStringStream.as rename to runtime/ActionScript/project/test/org/antlr/runtime/test/TestANTLRStringStream.as diff --git a/antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/TestBitSet.as b/runtime/ActionScript/project/test/org/antlr/runtime/test/TestBitSet.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/TestBitSet.as rename to runtime/ActionScript/project/test/org/antlr/runtime/test/TestBitSet.as diff --git a/antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/TestDFA.as b/runtime/ActionScript/project/test/org/antlr/runtime/test/TestDFA.as similarity index 100% rename from antlr-3.4/runtime/ActionScript/project/test/org/antlr/runtime/test/TestDFA.as rename to runtime/ActionScript/project/test/org/antlr/runtime/test/TestDFA.as diff --git a/antlr-3.4/runtime/C/AUTHORS b/runtime/C/AUTHORS similarity index 100% rename from antlr-3.4/runtime/C/AUTHORS rename to runtime/C/AUTHORS diff --git a/antlr-3.4/runtime/C/C.sln b/runtime/C/C.sln similarity index 100% rename from antlr-3.4/runtime/C/C.sln rename to runtime/C/C.sln diff --git a/antlr-3.4/runtime/C/C.vcproj b/runtime/C/C.vcproj similarity index 100% rename from antlr-3.4/runtime/C/C.vcproj rename to runtime/C/C.vcproj diff --git a/antlr-3.4/runtime/C/C.vcproj.vspscc b/runtime/C/C.vcproj.vspscc similarity index 100% rename from antlr-3.4/runtime/C/C.vcproj.vspscc rename to runtime/C/C.vcproj.vspscc diff --git a/antlr-3.4/runtime/C/C.vssscc b/runtime/C/C.vssscc similarity index 100% rename from antlr-3.4/runtime/C/C.vssscc rename to runtime/C/C.vssscc diff --git a/antlr-3.4/runtime/C/COPYING b/runtime/C/COPYING similarity index 100% rename from antlr-3.4/runtime/C/COPYING rename to runtime/C/COPYING diff --git a/antlr-3.4/runtime/C/ChangeLog b/runtime/C/ChangeLog similarity index 100% rename from antlr-3.4/runtime/C/ChangeLog rename to runtime/C/ChangeLog diff --git a/antlr-3.4/runtime/C/Cvs2005.sln b/runtime/C/Cvs2005.sln similarity index 100% rename from antlr-3.4/runtime/C/Cvs2005.sln rename to runtime/C/Cvs2005.sln diff --git a/antlr-3.4/runtime/C/Cvs2005.vcproj b/runtime/C/Cvs2005.vcproj similarity index 100% rename from antlr-3.4/runtime/C/Cvs2005.vcproj rename to runtime/C/Cvs2005.vcproj diff --git a/antlr-3.4/runtime/C/INSTALL b/runtime/C/INSTALL similarity index 100% rename from antlr-3.4/runtime/C/INSTALL rename to runtime/C/INSTALL diff --git a/antlr-3.4/runtime/C/Makefile.am b/runtime/C/Makefile.am similarity index 100% rename from antlr-3.4/runtime/C/Makefile.am rename to runtime/C/Makefile.am diff --git a/antlr-3.4/runtime/C/NEWS b/runtime/C/NEWS similarity index 100% rename from antlr-3.4/runtime/C/NEWS rename to runtime/C/NEWS diff --git a/antlr-3.4/runtime/C/README b/runtime/C/README similarity index 100% rename from antlr-3.4/runtime/C/README rename to runtime/C/README diff --git a/antlr-3.4/runtime/C/configure.ac b/runtime/C/configure.ac similarity index 100% rename from antlr-3.4/runtime/C/configure.ac rename to runtime/C/configure.ac diff --git a/antlr-3.4/runtime/C/dist/libantlr3c-3.4.tar.gz b/runtime/C/dist/libantlr3c-3.4.tar.gz similarity index 100% rename from antlr-3.4/runtime/C/dist/libantlr3c-3.4.tar.gz rename to runtime/C/dist/libantlr3c-3.4.tar.gz diff --git a/antlr-3.4/runtime/C/doxyfile b/runtime/C/doxyfile similarity index 100% rename from antlr-3.4/runtime/C/doxyfile rename to runtime/C/doxyfile diff --git a/antlr-3.4/runtime/C/doxygen/atsections.dox b/runtime/C/doxygen/atsections.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/atsections.dox rename to runtime/C/doxygen/atsections.dox diff --git a/antlr-3.4/runtime/C/doxygen/build.dox b/runtime/C/doxygen/build.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/build.dox rename to runtime/C/doxygen/build.dox diff --git a/antlr-3.4/runtime/C/doxygen/buildrec.dox b/runtime/C/doxygen/buildrec.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/buildrec.dox rename to runtime/C/doxygen/buildrec.dox diff --git a/antlr-3.4/runtime/C/doxygen/changes31.dox b/runtime/C/doxygen/changes31.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/changes31.dox rename to runtime/C/doxygen/changes31.dox diff --git a/antlr-3.4/runtime/C/doxygen/doxygengroups.dox b/runtime/C/doxygen/doxygengroups.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/doxygengroups.dox rename to runtime/C/doxygen/doxygengroups.dox diff --git a/antlr-3.4/runtime/C/doxygen/generate.dox b/runtime/C/doxygen/generate.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/generate.dox rename to runtime/C/doxygen/generate.dox diff --git a/antlr-3.4/runtime/C/doxygen/interop.dox b/runtime/C/doxygen/interop.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/interop.dox rename to runtime/C/doxygen/interop.dox diff --git a/antlr-3.4/runtime/C/doxygen/knownissues.dox b/runtime/C/doxygen/knownissues.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/knownissues.dox rename to runtime/C/doxygen/knownissues.dox diff --git a/antlr-3.4/runtime/C/doxygen/mainpage.dox b/runtime/C/doxygen/mainpage.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/mainpage.dox rename to runtime/C/doxygen/mainpage.dox diff --git a/antlr-3.4/runtime/C/doxygen/runtime.dox b/runtime/C/doxygen/runtime.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/runtime.dox rename to runtime/C/doxygen/runtime.dox diff --git a/antlr-3.4/runtime/C/doxygen/using.dox b/runtime/C/doxygen/using.dox similarity index 100% rename from antlr-3.4/runtime/C/doxygen/using.dox rename to runtime/C/doxygen/using.dox diff --git a/antlr-3.4/runtime/C/include/antlr3.h b/runtime/C/include/antlr3.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3.h rename to runtime/C/include/antlr3.h diff --git a/antlr-3.4/runtime/C/include/antlr3baserecognizer.h b/runtime/C/include/antlr3baserecognizer.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3baserecognizer.h rename to runtime/C/include/antlr3baserecognizer.h diff --git a/antlr-3.4/runtime/C/include/antlr3basetree.h b/runtime/C/include/antlr3basetree.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3basetree.h rename to runtime/C/include/antlr3basetree.h diff --git a/antlr-3.4/runtime/C/include/antlr3basetreeadaptor.h b/runtime/C/include/antlr3basetreeadaptor.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3basetreeadaptor.h rename to runtime/C/include/antlr3basetreeadaptor.h diff --git a/antlr-3.4/runtime/C/include/antlr3bitset.h b/runtime/C/include/antlr3bitset.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3bitset.h rename to runtime/C/include/antlr3bitset.h diff --git a/antlr-3.4/runtime/C/include/antlr3collections.h b/runtime/C/include/antlr3collections.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3collections.h rename to runtime/C/include/antlr3collections.h diff --git a/antlr-3.4/runtime/C/include/antlr3commontoken.h b/runtime/C/include/antlr3commontoken.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3commontoken.h rename to runtime/C/include/antlr3commontoken.h diff --git a/antlr-3.4/runtime/C/include/antlr3commontree.h b/runtime/C/include/antlr3commontree.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3commontree.h rename to runtime/C/include/antlr3commontree.h diff --git a/antlr-3.4/runtime/C/include/antlr3commontreeadaptor.h b/runtime/C/include/antlr3commontreeadaptor.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3commontreeadaptor.h rename to runtime/C/include/antlr3commontreeadaptor.h diff --git a/antlr-3.4/runtime/C/include/antlr3commontreenodestream.h b/runtime/C/include/antlr3commontreenodestream.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3commontreenodestream.h rename to runtime/C/include/antlr3commontreenodestream.h diff --git a/antlr-3.4/runtime/C/include/antlr3convertutf.h b/runtime/C/include/antlr3convertutf.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3convertutf.h rename to runtime/C/include/antlr3convertutf.h diff --git a/antlr-3.4/runtime/C/include/antlr3cyclicdfa.h b/runtime/C/include/antlr3cyclicdfa.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3cyclicdfa.h rename to runtime/C/include/antlr3cyclicdfa.h diff --git a/antlr-3.4/runtime/C/include/antlr3debugeventlistener.h b/runtime/C/include/antlr3debugeventlistener.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3debugeventlistener.h rename to runtime/C/include/antlr3debugeventlistener.h diff --git a/antlr-3.4/runtime/C/include/antlr3defs.h b/runtime/C/include/antlr3defs.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3defs.h rename to runtime/C/include/antlr3defs.h diff --git a/antlr-3.4/runtime/C/include/antlr3encodings.h b/runtime/C/include/antlr3encodings.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3encodings.h rename to runtime/C/include/antlr3encodings.h diff --git a/antlr-3.4/runtime/C/include/antlr3errors.h b/runtime/C/include/antlr3errors.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3errors.h rename to runtime/C/include/antlr3errors.h diff --git a/antlr-3.4/runtime/C/include/antlr3exception.h b/runtime/C/include/antlr3exception.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3exception.h rename to runtime/C/include/antlr3exception.h diff --git a/antlr-3.4/runtime/C/include/antlr3filestream.h b/runtime/C/include/antlr3filestream.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3filestream.h rename to runtime/C/include/antlr3filestream.h diff --git a/antlr-3.4/runtime/C/include/antlr3input.h b/runtime/C/include/antlr3input.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3input.h rename to runtime/C/include/antlr3input.h diff --git a/antlr-3.4/runtime/C/include/antlr3interfaces.h b/runtime/C/include/antlr3interfaces.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3interfaces.h rename to runtime/C/include/antlr3interfaces.h diff --git a/antlr-3.4/runtime/C/include/antlr3intstream.h b/runtime/C/include/antlr3intstream.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3intstream.h rename to runtime/C/include/antlr3intstream.h diff --git a/antlr-3.4/runtime/C/include/antlr3lexer.h b/runtime/C/include/antlr3lexer.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3lexer.h rename to runtime/C/include/antlr3lexer.h diff --git a/antlr-3.4/runtime/C/include/antlr3memory.h b/runtime/C/include/antlr3memory.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3memory.h rename to runtime/C/include/antlr3memory.h diff --git a/antlr-3.4/runtime/C/include/antlr3parser.h b/runtime/C/include/antlr3parser.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3parser.h rename to runtime/C/include/antlr3parser.h diff --git a/antlr-3.4/runtime/C/include/antlr3parsetree.h b/runtime/C/include/antlr3parsetree.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3parsetree.h rename to runtime/C/include/antlr3parsetree.h diff --git a/antlr-3.4/runtime/C/include/antlr3recognizersharedstate.h b/runtime/C/include/antlr3recognizersharedstate.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3recognizersharedstate.h rename to runtime/C/include/antlr3recognizersharedstate.h diff --git a/antlr-3.4/runtime/C/include/antlr3rewritestreams.h b/runtime/C/include/antlr3rewritestreams.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3rewritestreams.h rename to runtime/C/include/antlr3rewritestreams.h diff --git a/antlr-3.4/runtime/C/include/antlr3string.h b/runtime/C/include/antlr3string.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3string.h rename to runtime/C/include/antlr3string.h diff --git a/antlr-3.4/runtime/C/include/antlr3tokenstream.h b/runtime/C/include/antlr3tokenstream.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3tokenstream.h rename to runtime/C/include/antlr3tokenstream.h diff --git a/antlr-3.4/runtime/C/include/antlr3treeparser.h b/runtime/C/include/antlr3treeparser.h similarity index 100% rename from antlr-3.4/runtime/C/include/antlr3treeparser.h rename to runtime/C/include/antlr3treeparser.h diff --git a/antlr-3.4/runtime/C/m4/dummy b/runtime/C/m4/dummy similarity index 100% rename from antlr-3.4/runtime/C/m4/dummy rename to runtime/C/m4/dummy diff --git a/antlr-3.4/runtime/C/src/antlr3baserecognizer.c b/runtime/C/src/antlr3baserecognizer.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3baserecognizer.c rename to runtime/C/src/antlr3baserecognizer.c diff --git a/antlr-3.4/runtime/C/src/antlr3basetree.c b/runtime/C/src/antlr3basetree.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3basetree.c rename to runtime/C/src/antlr3basetree.c diff --git a/antlr-3.4/runtime/C/src/antlr3basetreeadaptor.c b/runtime/C/src/antlr3basetreeadaptor.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3basetreeadaptor.c rename to runtime/C/src/antlr3basetreeadaptor.c diff --git a/antlr-3.4/runtime/C/src/antlr3bitset.c b/runtime/C/src/antlr3bitset.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3bitset.c rename to runtime/C/src/antlr3bitset.c diff --git a/antlr-3.4/runtime/C/src/antlr3collections.c b/runtime/C/src/antlr3collections.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3collections.c rename to runtime/C/src/antlr3collections.c diff --git a/antlr-3.4/runtime/C/src/antlr3commontoken.c b/runtime/C/src/antlr3commontoken.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3commontoken.c rename to runtime/C/src/antlr3commontoken.c diff --git a/antlr-3.4/runtime/C/src/antlr3commontree.c b/runtime/C/src/antlr3commontree.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3commontree.c rename to runtime/C/src/antlr3commontree.c diff --git a/antlr-3.4/runtime/C/src/antlr3commontreeadaptor.c b/runtime/C/src/antlr3commontreeadaptor.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3commontreeadaptor.c rename to runtime/C/src/antlr3commontreeadaptor.c diff --git a/antlr-3.4/runtime/C/src/antlr3commontreenodestream.c b/runtime/C/src/antlr3commontreenodestream.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3commontreenodestream.c rename to runtime/C/src/antlr3commontreenodestream.c diff --git a/antlr-3.4/runtime/C/src/antlr3convertutf.c b/runtime/C/src/antlr3convertutf.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3convertutf.c rename to runtime/C/src/antlr3convertutf.c diff --git a/antlr-3.4/runtime/C/src/antlr3cyclicdfa.c b/runtime/C/src/antlr3cyclicdfa.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3cyclicdfa.c rename to runtime/C/src/antlr3cyclicdfa.c diff --git a/antlr-3.4/runtime/C/src/antlr3debughandlers.c b/runtime/C/src/antlr3debughandlers.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3debughandlers.c rename to runtime/C/src/antlr3debughandlers.c diff --git a/antlr-3.4/runtime/C/src/antlr3encodings.c b/runtime/C/src/antlr3encodings.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3encodings.c rename to runtime/C/src/antlr3encodings.c diff --git a/antlr-3.4/runtime/C/src/antlr3exception.c b/runtime/C/src/antlr3exception.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3exception.c rename to runtime/C/src/antlr3exception.c diff --git a/antlr-3.4/runtime/C/src/antlr3filestream.c b/runtime/C/src/antlr3filestream.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3filestream.c rename to runtime/C/src/antlr3filestream.c diff --git a/antlr-3.4/runtime/C/src/antlr3inputstream.c b/runtime/C/src/antlr3inputstream.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3inputstream.c rename to runtime/C/src/antlr3inputstream.c diff --git a/antlr-3.4/runtime/C/src/antlr3intstream.c b/runtime/C/src/antlr3intstream.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3intstream.c rename to runtime/C/src/antlr3intstream.c diff --git a/antlr-3.4/runtime/C/src/antlr3lexer.c b/runtime/C/src/antlr3lexer.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3lexer.c rename to runtime/C/src/antlr3lexer.c diff --git a/antlr-3.4/runtime/C/src/antlr3parser.c b/runtime/C/src/antlr3parser.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3parser.c rename to runtime/C/src/antlr3parser.c diff --git a/antlr-3.4/runtime/C/src/antlr3rewritestreams.c b/runtime/C/src/antlr3rewritestreams.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3rewritestreams.c rename to runtime/C/src/antlr3rewritestreams.c diff --git a/antlr-3.4/runtime/C/src/antlr3string.c b/runtime/C/src/antlr3string.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3string.c rename to runtime/C/src/antlr3string.c diff --git a/antlr-3.4/runtime/C/src/antlr3tokenstream.c b/runtime/C/src/antlr3tokenstream.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3tokenstream.c rename to runtime/C/src/antlr3tokenstream.c diff --git a/antlr-3.4/runtime/C/src/antlr3treeparser.c b/runtime/C/src/antlr3treeparser.c similarity index 100% rename from antlr-3.4/runtime/C/src/antlr3treeparser.c rename to runtime/C/src/antlr3treeparser.c diff --git a/antlr-3.4/runtime/C/vsrulefiles/antlr3lexer.rules b/runtime/C/vsrulefiles/antlr3lexer.rules similarity index 100% rename from antlr-3.4/runtime/C/vsrulefiles/antlr3lexer.rules rename to runtime/C/vsrulefiles/antlr3lexer.rules diff --git a/antlr-3.4/runtime/C/vsrulefiles/antlr3lexerandparser.rules b/runtime/C/vsrulefiles/antlr3lexerandparser.rules similarity index 100% rename from antlr-3.4/runtime/C/vsrulefiles/antlr3lexerandparser.rules rename to runtime/C/vsrulefiles/antlr3lexerandparser.rules diff --git a/antlr-3.4/runtime/C/vsrulefiles/antlr3parser.rules b/runtime/C/vsrulefiles/antlr3parser.rules similarity index 100% rename from antlr-3.4/runtime/C/vsrulefiles/antlr3parser.rules rename to runtime/C/vsrulefiles/antlr3parser.rules diff --git a/antlr-3.4/runtime/C/vsrulefiles/antlr3treeparser.rules b/runtime/C/vsrulefiles/antlr3treeparser.rules similarity index 100% rename from antlr-3.4/runtime/C/vsrulefiles/antlr3treeparser.rules rename to runtime/C/vsrulefiles/antlr3treeparser.rules diff --git a/antlr-3.4/runtime/CSharp2/API CHANGES.TXT b/runtime/CSharp2/API CHANGES.TXT similarity index 100% rename from antlr-3.4/runtime/CSharp2/API CHANGES.TXT rename to runtime/CSharp2/API CHANGES.TXT diff --git a/antlr-3.4/runtime/CSharp2/Cutting a new release.txt b/runtime/CSharp2/Cutting a new release.txt similarity index 100% rename from antlr-3.4/runtime/CSharp2/Cutting a new release.txt rename to runtime/CSharp2/Cutting a new release.txt diff --git a/antlr-3.4/runtime/CSharp2/LICENSE.TXT b/runtime/CSharp2/LICENSE.TXT similarity index 100% rename from antlr-3.4/runtime/CSharp2/LICENSE.TXT rename to runtime/CSharp2/LICENSE.TXT diff --git a/antlr-3.4/runtime/CSharp2/Libraries/MbUnit/MbUnit.Framework.dll b/runtime/CSharp2/Libraries/MbUnit/MbUnit.Framework.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/MbUnit/MbUnit.Framework.dll rename to runtime/CSharp2/Libraries/MbUnit/MbUnit.Framework.dll diff --git a/antlr-3.4/runtime/CSharp2/Libraries/MbUnit/MbUnit.MSBuild.Tasks.dll b/runtime/CSharp2/Libraries/MbUnit/MbUnit.MSBuild.Tasks.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/MbUnit/MbUnit.MSBuild.Tasks.dll rename to runtime/CSharp2/Libraries/MbUnit/MbUnit.MSBuild.Tasks.dll diff --git a/antlr-3.4/runtime/CSharp2/Libraries/MbUnit/MbUnit.Tasks.dll b/runtime/CSharp2/Libraries/MbUnit/MbUnit.Tasks.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/MbUnit/MbUnit.Tasks.dll rename to runtime/CSharp2/Libraries/MbUnit/MbUnit.Tasks.dll diff --git a/antlr-3.4/runtime/CSharp2/Libraries/MbUnit/QuickGraph.Algorithms.dll b/runtime/CSharp2/Libraries/MbUnit/QuickGraph.Algorithms.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/MbUnit/QuickGraph.Algorithms.dll rename to runtime/CSharp2/Libraries/MbUnit/QuickGraph.Algorithms.dll diff --git a/antlr-3.4/runtime/CSharp2/Libraries/MbUnit/QuickGraph.dll b/runtime/CSharp2/Libraries/MbUnit/QuickGraph.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/MbUnit/QuickGraph.dll rename to runtime/CSharp2/Libraries/MbUnit/QuickGraph.dll diff --git a/antlr-3.4/runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/StringTemplate.dll b/runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/StringTemplate.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/StringTemplate.dll rename to runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/StringTemplate.dll diff --git a/antlr-3.4/runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/antlr.runtime.dll b/runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/antlr.runtime.dll similarity index 100% rename from antlr-3.4/runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/antlr.runtime.dll rename to runtime/CSharp2/Libraries/StringTemplate.NET/net-2.0/antlr.runtime.dll diff --git a/antlr-3.4/runtime/CSharp2/NOTICE.TXT b/runtime/CSharp2/NOTICE.TXT similarity index 100% rename from antlr-3.4/runtime/CSharp2/NOTICE.TXT rename to runtime/CSharp2/NOTICE.TXT diff --git a/antlr-3.4/runtime/CSharp2/README.TXT b/runtime/CSharp2/README.TXT similarity index 100% rename from antlr-3.4/runtime/CSharp2/README.TXT rename to runtime/CSharp2/README.TXT diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime (VS2005).sln b/runtime/CSharp2/Sources/Antlr3.Runtime (VS2005).sln similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime (VS2005).sln rename to runtime/CSharp2/Sources/Antlr3.Runtime (VS2005).sln diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime (VS2008).sln b/runtime/CSharp2/Sources/Antlr3.Runtime (VS2008).sln similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime (VS2008).sln rename to runtime/CSharp2/Sources/Antlr3.Runtime (VS2008).sln diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ANTLRxxxxStreamFixture.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ANTLRxxxxStreamFixture.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ANTLRxxxxStreamFixture.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ANTLRxxxxStreamFixture.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2005).csproj b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2005).csproj similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2005).csproj rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2005).csproj diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2008).csproj b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2008).csproj similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2008).csproj rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Antlr3.Runtime.Tests (VS2008).csproj diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeFixture.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeFixture.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeFixture.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeFixture.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeNodeStreamFixture.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeNodeStreamFixture.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeNodeStreamFixture.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/ITreeNodeStreamFixture.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Properties/AssemblyInfo.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Properties/AssemblyInfo.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/Properties/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/RewriteRuleXxxxStreamFixture.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/RewriteRuleXxxxStreamFixture.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/RewriteRuleXxxxStreamFixture.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/RewriteRuleXxxxStreamFixture.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestDriver.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestDriver.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestDriver.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestDriver.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestFixtureBase.cs b/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestFixtureBase.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestFixtureBase.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime.Tests/TestFixtureBase.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/HashList.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/HashList.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/HashList.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/HashList.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/StackList.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/StackList.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/StackList.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Collections/StackList.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/BlankDebugEventListener.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/BlankDebugEventListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/BlankDebugEventListener.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/BlankDebugEventListener.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventHub.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventHub.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventHub.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventHub.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventListenerConstants.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventListenerConstants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventListenerConstants.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventListenerConstants.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventRepeater.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventRepeater.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventRepeater.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventRepeater.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventSocketProxy.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventSocketProxy.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventSocketProxy.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugEventSocketProxy.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugParser.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugParser.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugParser.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeAdaptor.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeAdaptor.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeNodeStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeNodeStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeParser.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeParser.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/DebugTreeParser.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/IDebugEventListener.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/IDebugEventListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/IDebugEventListener.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/IDebugEventListener.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/ParseTreeBuilder.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/ParseTreeBuilder.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/ParseTreeBuilder.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/ParseTreeBuilder.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Profiler.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Profiler.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Profiler.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Profiler.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/RemoteDebugEventSocketListener.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/RemoteDebugEventSocketListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/RemoteDebugEventSocketListener.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/RemoteDebugEventSocketListener.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/TraceDebugEventListener.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/TraceDebugEventListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/TraceDebugEventListener.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/TraceDebugEventListener.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Tracer.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Tracer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Tracer.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Debug/Tracer.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/Check.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/Check.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/Check.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/Check.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/DictionaryExtensions.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/DictionaryExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/DictionaryExtensions.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/DictionaryExtensions.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/EnumerableExtensions.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/EnumerableExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/EnumerableExtensions.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/EnumerableExtensions.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/ExceptionExtensions.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/ExceptionExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/ExceptionExtensions.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/ExceptionExtensions.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/IOExtensions.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/IOExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/IOExtensions.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/IOExtensions.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/JSystem.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/JSystem.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/JSystem.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/JSystem.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/LexerExtensions.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/LexerExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/LexerExtensions.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/LexerExtensions.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringExtensions.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringExtensions.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringExtensions.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringTokenizer.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringTokenizer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringTokenizer.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.JavaExtensions/StringTokenizer.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/DoubleKeyMap.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/DoubleKeyMap.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/DoubleKeyMap.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/DoubleKeyMap.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/ErrorManager.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/ErrorManager.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/ErrorManager.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/ErrorManager.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/FastQueue.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/FastQueue.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/FastQueue.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/FastQueue.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/LookaheadStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/LookaheadStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/LookaheadStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/LookaheadStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/Stats.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/Stats.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/Stats.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Misc/Stats.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTree.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTree.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTree.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTreeAdaptor.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTreeAdaptor.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BaseTreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BufferedTreeNodeStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BufferedTreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BufferedTreeNodeStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/BufferedTreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonErrorNode.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonErrorNode.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonErrorNode.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonErrorNode.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTree.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTree.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTree.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeAdaptor.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeAdaptor.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeNodeStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeNodeStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/CommonTreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/DotTreeGenerator.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/DotTreeGenerator.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/DotTreeGenerator.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/DotTreeGenerator.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITree.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITree.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITree.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeAdaptor.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeAdaptor.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeNodeStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeNodeStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeVisitorAction.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeVisitorAction.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeVisitorAction.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ITreeVisitorAction.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ParseTree.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ParseTree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ParseTree.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/ParseTree.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteCardinalityException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteCardinalityException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteCardinalityException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteCardinalityException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEarlyExitException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEarlyExitException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEarlyExitException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEarlyExitException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEmptyStreamException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEmptyStreamException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEmptyStreamException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteEmptyStreamException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleElementStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleElementStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleElementStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleElementStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleNodeStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleNodeStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleSubtreeStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleSubtreeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleSubtreeStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleSubtreeStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleTokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleTokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/RewriteRuleTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeConstants.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeConstants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeConstants.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeConstants.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeFilter.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeFilter.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeFilter.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeFilter.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeIterator.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeIterator.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeIterator.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeIterator.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeParser.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeParser.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeParser.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternLexer.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternLexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternLexer.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternLexer.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternParser.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternParser.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreePatternParser.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRewriter.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRewriter.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRewriter.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRewriter.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRuleReturnScope.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRuleReturnScope.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeRuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeVisitor.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeVisitor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeVisitor.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeVisitor.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeWizard.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeWizard.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeWizard.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime.Tree/TreeWizard.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRFileStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRFileStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRFileStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRFileStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRInputStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRInputStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRInputStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRInputStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRReaderStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRReaderStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRReaderStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRReaderStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRStringStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRStringStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRStringStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ANTLRStringStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BaseRecognizer.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BaseRecognizer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BaseRecognizer.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BaseRecognizer.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BitSet.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BitSet.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BitSet.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BitSet.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BufferedTokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BufferedTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BufferedTokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/BufferedTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamConstants.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamConstants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamConstants.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamConstants.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamState.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamState.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamState.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CharStreamState.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ClassicToken.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ClassicToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ClassicToken.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ClassicToken.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonToken.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonToken.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonToken.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonTokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonTokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/CommonTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Constants.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Constants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Constants.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Constants.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/DFA.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/DFA.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/DFA.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/DFA.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/EarlyExitException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/EarlyExitException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/EarlyExitException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/EarlyExitException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/FailedPredicateException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/FailedPredicateException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/FailedPredicateException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/FailedPredicateException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/GrammarRuleAttribute.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/GrammarRuleAttribute.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/GrammarRuleAttribute.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/GrammarRuleAttribute.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ICharStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ICharStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ICharStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ICharStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IIntStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IIntStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IIntStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IIntStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IToken.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IToken.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/IToken.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenSource.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenSource.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenSource.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenSource.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStreamInformation.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStreamInformation.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStreamInformation.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ITokenStreamInformation.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/LegacyCommonTokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/LegacyCommonTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/LegacyCommonTokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/LegacyCommonTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Lexer.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Lexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Lexer.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Lexer.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedNotSetException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedNotSetException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedNotSetException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedNotSetException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedRangeException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedRangeException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedRangeException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedRangeException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedSetException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedSetException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedSetException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedSetException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTokenException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTokenException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTokenException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTokenException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTreeNodeException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTreeNodeException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTreeNodeException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MismatchedTreeNodeException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MissingTokenException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MissingTokenException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MissingTokenException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/MissingTokenException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/NoViableAltException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/NoViableAltException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/NoViableAltException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/NoViableAltException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Parser.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Parser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Parser.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/Parser.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ParserRuleReturnScope.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ParserRuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ParserRuleReturnScope.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/ParserRuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognitionException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognitionException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognitionException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognitionException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognizerSharedState.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognizerSharedState.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognizerSharedState.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RecognizerSharedState.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RuleReturnScope.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RuleReturnScope.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/RuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenConstants.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenConstants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenConstants.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenConstants.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenRewriteStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenRewriteStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenRewriteStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/TokenRewriteStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnbufferedTokenStream.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnbufferedTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnbufferedTokenStream.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnbufferedTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnwantedTokenException.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnwantedTokenException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnwantedTokenException.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr.Runtime/UnwantedTokenException.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2005).csproj b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2005).csproj similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2005).csproj rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2005).csproj diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2008).csproj b/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2008).csproj similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2008).csproj rename to runtime/CSharp2/Sources/Antlr3.Runtime/Antlr3.Runtime (VS2008).csproj diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/AssemblyInfo.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/AssemblyInfo.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Messages.Designer.cs b/runtime/CSharp2/Sources/Antlr3.Runtime/Messages.Designer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Messages.Designer.cs rename to runtime/CSharp2/Sources/Antlr3.Runtime/Messages.Designer.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Messages.resx b/runtime/CSharp2/Sources/Antlr3.Runtime/Messages.resx similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/Messages.resx rename to runtime/CSharp2/Sources/Antlr3.Runtime/Messages.resx diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/default.build b/runtime/CSharp2/Sources/Antlr3.Runtime/default.build similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Runtime/default.build rename to runtime/CSharp2/Sources/Antlr3.Runtime/default.build diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/Antlr.Utility.Tree/DOTTreeGenerator.cs b/runtime/CSharp2/Sources/Antlr3.Utility/Antlr.Utility.Tree/DOTTreeGenerator.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/Antlr.Utility.Tree/DOTTreeGenerator.cs rename to runtime/CSharp2/Sources/Antlr3.Utility/Antlr.Utility.Tree/DOTTreeGenerator.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2005).csproj b/runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2005).csproj similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2005).csproj rename to runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2005).csproj diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2008).csproj b/runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2008).csproj similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2008).csproj rename to runtime/CSharp2/Sources/Antlr3.Utility/Antlr3.Utility (VS2008).csproj diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/AssemblyInfo.cs b/runtime/CSharp2/Sources/Antlr3.Utility/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/AssemblyInfo.cs rename to runtime/CSharp2/Sources/Antlr3.Utility/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/default.build b/runtime/CSharp2/Sources/Antlr3.Utility/default.build similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3.Utility/default.build rename to runtime/CSharp2/Sources/Antlr3.Utility/default.build diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3_KeyPair.snk b/runtime/CSharp2/Sources/Antlr3_KeyPair.snk similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3_KeyPair.snk rename to runtime/CSharp2/Sources/Antlr3_KeyPair.snk diff --git a/antlr-3.4/runtime/CSharp2/Sources/Antlr3_PublicKey.snk b/runtime/CSharp2/Sources/Antlr3_PublicKey.snk similarity index 100% rename from antlr-3.4/runtime/CSharp2/Sources/Antlr3_PublicKey.snk rename to runtime/CSharp2/Sources/Antlr3_PublicKey.snk diff --git a/antlr-3.4/runtime/CSharp2/all.antlr3.runtime.net.build b/runtime/CSharp2/all.antlr3.runtime.net.build similarity index 100% rename from antlr-3.4/runtime/CSharp2/all.antlr3.runtime.net.build rename to runtime/CSharp2/all.antlr3.runtime.net.build diff --git a/antlr-3.4/runtime/CSharp2/antlr3.runtime.net.common.inc b/runtime/CSharp2/antlr3.runtime.net.common.inc similarity index 100% rename from antlr-3.4/runtime/CSharp2/antlr3.runtime.net.common.inc rename to runtime/CSharp2/antlr3.runtime.net.common.inc diff --git a/antlr-3.4/runtime/CSharp2/dist/DOT-NET-runtime-3.1.3.zip b/runtime/CSharp2/dist/DOT-NET-runtime-3.1.3.zip similarity index 100% rename from antlr-3.4/runtime/CSharp2/dist/DOT-NET-runtime-3.1.3.zip rename to runtime/CSharp2/dist/DOT-NET-runtime-3.1.3.zip diff --git a/antlr-3.4/runtime/CSharp2/doxyfile b/runtime/CSharp2/doxyfile similarity index 100% rename from antlr-3.4/runtime/CSharp2/doxyfile rename to runtime/CSharp2/doxyfile diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj.vspscc b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj.vspscc similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj.vspscc rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Antlr3.Runtime.Debug.csproj.vspscc diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/BlankDebugEventListener.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/BlankDebugEventListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/BlankDebugEventListener.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/BlankDebugEventListener.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventHub.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventHub.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventHub.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventHub.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventListenerConstants.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventListenerConstants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventListenerConstants.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventListenerConstants.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventRepeater.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventRepeater.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventRepeater.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventRepeater.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventSocketProxy.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventSocketProxy.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventSocketProxy.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugEventSocketProxy.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugParser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugParser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugParser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeAdaptor.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeAdaptor.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeNodeStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeNodeStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeParser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeParser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/DebugTreeParser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/JavaExtensions/ExceptionExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/JavaExtensions/ExceptionExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/JavaExtensions/ExceptionExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/JavaExtensions/ExceptionExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/DoubleKeyMap`3.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/DoubleKeyMap`3.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/DoubleKeyMap`3.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/DoubleKeyMap`3.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/Stats.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/Stats.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/Stats.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Misc/Stats.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParseTreeBuilder.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParseTreeBuilder.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParseTreeBuilder.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParseTreeBuilder.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParserDebugger.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParserDebugger.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParserDebugger.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/ParserDebugger.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Profiler.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Profiler.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Profiler.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Profiler.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Properties/AssemblyInfo.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Properties/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Properties/AssemblyInfo.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Properties/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/RemoteDebugEventSocketListener.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/RemoteDebugEventSocketListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/RemoteDebugEventSocketListener.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/RemoteDebugEventSocketListener.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/TraceDebugEventListener.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/TraceDebugEventListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/TraceDebugEventListener.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/TraceDebugEventListener.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Tracer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Tracer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Tracer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Debug/Tracer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj.vspscc b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj.vspscc similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj.vspscc rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Antlr3.Runtime.JavaExtensions.csproj.vspscc diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/DictionaryExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/DictionaryExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/DictionaryExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/DictionaryExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ExceptionExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ExceptionExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ExceptionExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ExceptionExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/IOExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/IOExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/IOExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/IOExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/JSystem.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/JSystem.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/JSystem.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/JSystem.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/LexerExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/LexerExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/LexerExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/LexerExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ListExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ListExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ListExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ListExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ObjectExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ObjectExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ObjectExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/ObjectExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/Properties/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SetExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SetExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SetExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SetExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StackExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StackExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StackExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StackExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringBuilderExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringBuilderExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringBuilderExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringBuilderExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringTokenizer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringTokenizer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringTokenizer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/StringTokenizer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SubList.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SubList.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SubList.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/SubList.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TreeExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TreeExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TreeExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TreeExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TypeExtensions.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TypeExtensions.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TypeExtensions.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.JavaExtensions/TypeExtensions.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj.vspscc b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj.vspscc similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj.vspscc rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Antlr3.Runtime.Test.csproj.vspscc diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammar.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammar.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammar.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammar.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexerHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexerHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexerHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarLexerHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParserHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParserHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParserHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugGrammarParserHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammar.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammarHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammarHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammarHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/DebugTreeGrammarHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammar.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammar.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammar.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammar.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexerHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexerHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexerHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarLexerHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParserHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParserHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParserHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileGrammarParserHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammar.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammarHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammarHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammarHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/BuildOptions/ProfileTreeGrammarHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Program.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Program.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Program.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Program.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Reduce.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Reduce.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Reduce.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Reduce.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Simplify.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Simplify.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Simplify.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/Simplify.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Lexer.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Lexer.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Lexer.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Lexer.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Parser.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Parser.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Parser.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Composition/VecMath_Parser.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpression.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpression.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpression.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpression.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionLexerHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionLexerHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionLexerHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionLexerHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionParserHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionParserHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionParserHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/FastSimpleExpressionParserHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/JavaCompat/Expr.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/JavaCompat/Expr.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/JavaCompat/Expr.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/JavaCompat/Expr.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Properties/AssemblyInfo.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Properties/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/Properties/AssemblyInfo.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/Properties/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.lexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.lexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.lexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.lexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.parser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.parser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.parser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SemanticPredicateReduction.g3.parser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpression.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpression.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpression.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpression.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionLexerHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionLexerHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionLexerHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionLexerHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionParserHelper.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionParserHelper.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionParserHelper.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SimpleExpressionParserHelper.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenSource`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenSource`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenSource`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenSource`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenStream`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenStream`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenStream`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/ITokenStream`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimLexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimLexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimLexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimLexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimStringStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimStringStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimStringStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimStringStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimToken.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimToken.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimToken.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/SlimTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeAdaptor`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeAdaptor`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeAdaptor`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeAdaptor`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeFactory.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeFactory.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeFactory.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeFactory.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeNodeStream`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeNodeStream`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeNodeStream`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/SlimParsing/Tree/ITreeNodeStream`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.lexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.lexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.lexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.lexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.parser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.parser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.parser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/StringTemplateOutput.g3.parser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.lexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.lexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.lexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.lexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.parser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.parser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.parser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestActionFeatures.g3.parser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestDotTreeGenerator.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestDotTreeGenerator.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestDotTreeGenerator.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestDotTreeGenerator.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3 b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3 similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3 rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3 diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.lexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.lexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.lexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.lexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.parser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.parser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.parser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestExpressionFeatures.g3.parser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestFastLexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestFastLexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestFastLexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime.Test/TestFastLexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.sln b/runtime/CSharp3/Sources/Antlr3.Runtime.sln similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.sln rename to runtime/CSharp3/Sources/Antlr3.Runtime.sln diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.vssscc b/runtime/CSharp3/Sources/Antlr3.Runtime.vssscc similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime.vssscc rename to runtime/CSharp3/Sources/Antlr3.Runtime.vssscc diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRFileStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRFileStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRFileStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRFileStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRInputStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRInputStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRInputStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRInputStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRReaderStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRReaderStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRReaderStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRReaderStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRStringStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRStringStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRStringStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ANTLRStringStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj b/runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj rename to runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj.vspscc b/runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj.vspscc similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj.vspscc rename to runtime/CSharp3/Sources/Antlr3.Runtime/Antlr3.Runtime.csproj.vspscc diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/AstParserRuleReturnScope`2.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/AstParserRuleReturnScope`2.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/AstParserRuleReturnScope`2.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/AstParserRuleReturnScope`2.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/BaseRecognizer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/BaseRecognizer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/BaseRecognizer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/BaseRecognizer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/BitSet.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/BitSet.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/BitSet.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/BitSet.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/BufferedTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/BufferedTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/BufferedTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/BufferedTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamConstants.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamConstants.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamConstants.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamConstants.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamState.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamState.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamState.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/CharStreamState.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ClassicToken.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ClassicToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ClassicToken.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ClassicToken.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CommonToken.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/CommonToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CommonToken.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/CommonToken.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CommonTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/CommonTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/CommonTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/CommonTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/DFA.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/DFA.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/DFA.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/DFA.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Debug/IDebugEventListener.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Debug/IDebugEventListener.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Debug/IDebugEventListener.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Debug/IDebugEventListener.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/EarlyExitException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/EarlyExitException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/EarlyExitException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/EarlyExitException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/FailedPredicateException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/FailedPredicateException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/FailedPredicateException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/FailedPredicateException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/GrammarRuleAttribute.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/GrammarRuleAttribute.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/GrammarRuleAttribute.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/GrammarRuleAttribute.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/IAstRuleReturnScope`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ICharStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ICharStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ICharStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ICharStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IIntStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/IIntStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IIntStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/IIntStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/IRuleReturnScope`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ITemplateRuleReturnScope`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IToken.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/IToken.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/IToken.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/IToken.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenSource.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenSource.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenSource.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ITokenSource.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStreamInformation.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStreamInformation.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStreamInformation.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ITokenStreamInformation.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/LegacyCommonTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/LegacyCommonTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/LegacyCommonTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/LegacyCommonTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Lexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Lexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Lexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Lexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FastQueue.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FastQueue.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FastQueue.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FastQueue.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FunctionDelegates.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FunctionDelegates.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FunctionDelegates.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Misc/FunctionDelegates.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/ListStack`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/ListStack`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/ListStack`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Misc/ListStack`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/LookaheadStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/LookaheadStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Misc/LookaheadStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Misc/LookaheadStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedNotSetException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedNotSetException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedNotSetException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedNotSetException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedRangeException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedRangeException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedRangeException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedRangeException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedSetException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedSetException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedSetException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedSetException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTokenException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTokenException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTokenException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTokenException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTreeNodeException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTreeNodeException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTreeNodeException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/MismatchedTreeNodeException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MissingTokenException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/MissingTokenException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/MissingTokenException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/MissingTokenException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/NoViableAltException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/NoViableAltException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/NoViableAltException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/NoViableAltException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Parser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Parser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Parser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Parser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ParserRuleReturnScope.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/ParserRuleReturnScope.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/ParserRuleReturnScope.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/ParserRuleReturnScope.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Properties/AssemblyInfo.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Properties/AssemblyInfo.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Properties/AssemblyInfo.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Properties/AssemblyInfo.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/RecognitionException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/RecognitionException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/RecognitionException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/RecognitionException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/RecognizerSharedState.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/RecognizerSharedState.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/RecognizerSharedState.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/RecognizerSharedState.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TemplateParserRuleReturnScope`2.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/TemplateParserRuleReturnScope`2.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TemplateParserRuleReturnScope`2.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/TemplateParserRuleReturnScope`2.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TokenChannels.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/TokenChannels.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TokenChannels.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/TokenChannels.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TokenRewriteStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/TokenRewriteStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TokenRewriteStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/TokenRewriteStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TokenTypes.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/TokenTypes.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/TokenTypes.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/TokenTypes.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tokens.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tokens.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tokens.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tokens.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AntlrRuntime_BaseTreeDebugView.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AntlrRuntime_BaseTreeDebugView.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AntlrRuntime_BaseTreeDebugView.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AntlrRuntime_BaseTreeDebugView.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AstTreeRuleReturnScope`2.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AstTreeRuleReturnScope`2.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AstTreeRuleReturnScope`2.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/AstTreeRuleReturnScope`2.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTree.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTree.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTree.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTreeAdaptor.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTreeAdaptor.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BaseTreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BufferedTreeNodeStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BufferedTreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BufferedTreeNodeStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/BufferedTreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonErrorNode.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonErrorNode.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonErrorNode.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonErrorNode.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTree.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTree.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTree.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeAdaptor.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeAdaptor.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeNodeStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeNodeStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/CommonTreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/DotTreeGenerator.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/DotTreeGenerator.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/DotTreeGenerator.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/DotTreeGenerator.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITree.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITree.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITree.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeAdaptor.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeAdaptor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeAdaptor.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeAdaptor.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeNodeStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeNodeStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeVisitorAction.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeVisitorAction.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeVisitorAction.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ITreeVisitorAction.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ParseTree.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ParseTree.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ParseTree.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/ParseTree.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteCardinalityException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteCardinalityException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteCardinalityException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteCardinalityException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEarlyExitException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEarlyExitException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEarlyExitException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEarlyExitException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEmptyStreamException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEmptyStreamException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEmptyStreamException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteEmptyStreamException.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleElementStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleElementStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleElementStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleElementStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleNodeStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleNodeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleNodeStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleNodeStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleSubtreeStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleSubtreeStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleSubtreeStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleSubtreeStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/RewriteRuleTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TemplateTreeRuleReturnScope`2.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TemplateTreeRuleReturnScope`2.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TemplateTreeRuleReturnScope`2.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TemplateTreeRuleReturnScope`2.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeFilter.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeFilter.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeFilter.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeFilter.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeIterator.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeIterator.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeIterator.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeIterator.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeParser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeParser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeParser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternLexer.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternLexer.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternLexer.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternLexer.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternParser.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternParser.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternParser.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreePatternParser.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRewriter.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRewriter.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRewriter.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRewriter.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRuleReturnScope`1.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRuleReturnScope`1.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRuleReturnScope`1.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeRuleReturnScope`1.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeVisitor.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeVisitor.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeVisitor.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeVisitor.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeWizard.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeWizard.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeWizard.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/Tree/TreeWizard.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/UnbufferedTokenStream.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/UnbufferedTokenStream.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/UnbufferedTokenStream.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/UnbufferedTokenStream.cs diff --git a/antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/UnwantedTokenException.cs b/runtime/CSharp3/Sources/Antlr3.Runtime/UnwantedTokenException.cs similarity index 100% rename from antlr-3.4/runtime/CSharp3/Sources/Antlr3.Runtime/UnwantedTokenException.cs rename to runtime/CSharp3/Sources/Antlr3.Runtime/UnwantedTokenException.cs diff --git a/antlr-3.4/runtime/Delphi/LICENSE.TXT b/runtime/Delphi/LICENSE.TXT similarity index 100% rename from antlr-3.4/runtime/Delphi/LICENSE.TXT rename to runtime/Delphi/LICENSE.TXT diff --git a/antlr-3.4/runtime/Delphi/NOTICE.TXT b/runtime/Delphi/NOTICE.TXT similarity index 100% rename from antlr-3.4/runtime/Delphi/NOTICE.TXT rename to runtime/Delphi/NOTICE.TXT diff --git a/antlr-3.4/runtime/Delphi/README.TXT b/runtime/Delphi/README.TXT similarity index 100% rename from antlr-3.4/runtime/Delphi/README.TXT rename to runtime/Delphi/README.TXT diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Collections.Tests.pas b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Collections.Tests.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Collections.Tests.pas rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Collections.Tests.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tests.pas b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tests.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tests.pas rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tests.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tools.Tests.pas b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tools.Tests.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tools.Tests.pas rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tools.Tests.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tree.Tests.pas b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tree.Tests.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tree.Tests.pas rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/Antlr.Runtime.Tree.Tests.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dpr b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dpr similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dpr rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dpr diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dproj b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dproj similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dproj rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.dproj diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.res b/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.res similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.res rename to runtime/Delphi/Sources/Antlr3.Runtime.Tests/TestDriver.res diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Collections.pas b/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Collections.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Collections.pas rename to runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Collections.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tools.pas b/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tools.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tools.pas rename to runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tools.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tree.pas b/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tree.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tree.pas rename to runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.Tree.pas diff --git a/antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.pas b/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.pas similarity index 100% rename from antlr-3.4/runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.pas rename to runtime/Delphi/Sources/Antlr3.Runtime/Antlr.Runtime.pas diff --git a/antlr-3.4/runtime/Java/antlr.config b/runtime/Java/antlr.config similarity index 100% rename from antlr-3.4/runtime/Java/antlr.config rename to runtime/Java/antlr.config diff --git a/antlr-3.4/runtime/Java/doxyfile b/runtime/Java/doxyfile similarity index 100% rename from antlr-3.4/runtime/Java/doxyfile rename to runtime/Java/doxyfile diff --git a/antlr-3.4/runtime/Java/pom.xml b/runtime/Java/pom.xml similarity index 100% rename from antlr-3.4/runtime/Java/pom.xml rename to runtime/Java/pom.xml diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRFileStream.java b/runtime/Java/src/main/java/org/antlr/runtime/ANTLRFileStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRFileStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/ANTLRFileStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRInputStream.java b/runtime/Java/src/main/java/org/antlr/runtime/ANTLRInputStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRInputStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/ANTLRInputStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRReaderStream.java b/runtime/Java/src/main/java/org/antlr/runtime/ANTLRReaderStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRReaderStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/ANTLRReaderStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRStringStream.java b/runtime/Java/src/main/java/org/antlr/runtime/ANTLRStringStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ANTLRStringStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/ANTLRStringStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/BaseRecognizer.java b/runtime/Java/src/main/java/org/antlr/runtime/BaseRecognizer.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/BaseRecognizer.java rename to runtime/Java/src/main/java/org/antlr/runtime/BaseRecognizer.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/BitSet.java b/runtime/Java/src/main/java/org/antlr/runtime/BitSet.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/BitSet.java rename to runtime/Java/src/main/java/org/antlr/runtime/BitSet.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/BufferedTokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/BufferedTokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/BufferedTokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/BufferedTokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CharStream.java b/runtime/Java/src/main/java/org/antlr/runtime/CharStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CharStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/CharStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CharStreamState.java b/runtime/Java/src/main/java/org/antlr/runtime/CharStreamState.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CharStreamState.java rename to runtime/Java/src/main/java/org/antlr/runtime/CharStreamState.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ClassicToken.java b/runtime/Java/src/main/java/org/antlr/runtime/ClassicToken.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ClassicToken.java rename to runtime/Java/src/main/java/org/antlr/runtime/ClassicToken.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CommonToken.java b/runtime/Java/src/main/java/org/antlr/runtime/CommonToken.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CommonToken.java rename to runtime/Java/src/main/java/org/antlr/runtime/CommonToken.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CommonTokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/CommonTokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/CommonTokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/CommonTokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/DFA.java b/runtime/Java/src/main/java/org/antlr/runtime/DFA.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/DFA.java rename to runtime/Java/src/main/java/org/antlr/runtime/DFA.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/EarlyExitException.java b/runtime/Java/src/main/java/org/antlr/runtime/EarlyExitException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/EarlyExitException.java rename to runtime/Java/src/main/java/org/antlr/runtime/EarlyExitException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/FailedPredicateException.java b/runtime/Java/src/main/java/org/antlr/runtime/FailedPredicateException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/FailedPredicateException.java rename to runtime/Java/src/main/java/org/antlr/runtime/FailedPredicateException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/IntStream.java b/runtime/Java/src/main/java/org/antlr/runtime/IntStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/IntStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/IntStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/LegacyCommonTokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/LegacyCommonTokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/LegacyCommonTokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/LegacyCommonTokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/Lexer.java b/runtime/Java/src/main/java/org/antlr/runtime/Lexer.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/Lexer.java rename to runtime/Java/src/main/java/org/antlr/runtime/Lexer.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedNotSetException.java b/runtime/Java/src/main/java/org/antlr/runtime/MismatchedNotSetException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedNotSetException.java rename to runtime/Java/src/main/java/org/antlr/runtime/MismatchedNotSetException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedRangeException.java b/runtime/Java/src/main/java/org/antlr/runtime/MismatchedRangeException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedRangeException.java rename to runtime/Java/src/main/java/org/antlr/runtime/MismatchedRangeException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedSetException.java b/runtime/Java/src/main/java/org/antlr/runtime/MismatchedSetException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedSetException.java rename to runtime/Java/src/main/java/org/antlr/runtime/MismatchedSetException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedTokenException.java b/runtime/Java/src/main/java/org/antlr/runtime/MismatchedTokenException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedTokenException.java rename to runtime/Java/src/main/java/org/antlr/runtime/MismatchedTokenException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedTreeNodeException.java b/runtime/Java/src/main/java/org/antlr/runtime/MismatchedTreeNodeException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MismatchedTreeNodeException.java rename to runtime/Java/src/main/java/org/antlr/runtime/MismatchedTreeNodeException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MissingTokenException.java b/runtime/Java/src/main/java/org/antlr/runtime/MissingTokenException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/MissingTokenException.java rename to runtime/Java/src/main/java/org/antlr/runtime/MissingTokenException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/NoViableAltException.java b/runtime/Java/src/main/java/org/antlr/runtime/NoViableAltException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/NoViableAltException.java rename to runtime/Java/src/main/java/org/antlr/runtime/NoViableAltException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/Parser.java b/runtime/Java/src/main/java/org/antlr/runtime/Parser.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/Parser.java rename to runtime/Java/src/main/java/org/antlr/runtime/Parser.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ParserRuleReturnScope.java b/runtime/Java/src/main/java/org/antlr/runtime/ParserRuleReturnScope.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/ParserRuleReturnScope.java rename to runtime/Java/src/main/java/org/antlr/runtime/ParserRuleReturnScope.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/RecognitionException.java b/runtime/Java/src/main/java/org/antlr/runtime/RecognitionException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/RecognitionException.java rename to runtime/Java/src/main/java/org/antlr/runtime/RecognitionException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/RecognizerSharedState.java b/runtime/Java/src/main/java/org/antlr/runtime/RecognizerSharedState.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/RecognizerSharedState.java rename to runtime/Java/src/main/java/org/antlr/runtime/RecognizerSharedState.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/RuleReturnScope.java b/runtime/Java/src/main/java/org/antlr/runtime/RuleReturnScope.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/RuleReturnScope.java rename to runtime/Java/src/main/java/org/antlr/runtime/RuleReturnScope.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/SerializedGrammar.java b/runtime/Java/src/main/java/org/antlr/runtime/SerializedGrammar.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/SerializedGrammar.java rename to runtime/Java/src/main/java/org/antlr/runtime/SerializedGrammar.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/Token.java b/runtime/Java/src/main/java/org/antlr/runtime/Token.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/Token.java rename to runtime/Java/src/main/java/org/antlr/runtime/Token.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/TokenRewriteStream.java b/runtime/Java/src/main/java/org/antlr/runtime/TokenRewriteStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/TokenRewriteStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/TokenRewriteStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/TokenSource.java b/runtime/Java/src/main/java/org/antlr/runtime/TokenSource.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/TokenSource.java rename to runtime/Java/src/main/java/org/antlr/runtime/TokenSource.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/TokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/TokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/TokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/TokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/UnbufferedTokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/UnbufferedTokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/UnbufferedTokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/UnbufferedTokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/UnwantedTokenException.java b/runtime/Java/src/main/java/org/antlr/runtime/UnwantedTokenException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/UnwantedTokenException.java rename to runtime/Java/src/main/java/org/antlr/runtime/UnwantedTokenException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/BlankDebugEventListener.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/BlankDebugEventListener.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/BlankDebugEventListener.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/BlankDebugEventListener.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventHub.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventHub.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventHub.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventHub.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventListener.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventListener.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventListener.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventListener.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventRepeater.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventRepeater.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventRepeater.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventRepeater.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventSocketProxy.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventSocketProxy.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventSocketProxy.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugEventSocketProxy.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugParser.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugParser.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugParser.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugParser.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeAdaptor.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeAdaptor.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeAdaptor.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeAdaptor.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeNodeStream.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeNodeStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeNodeStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeNodeStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeParser.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeParser.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeParser.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/DebugTreeParser.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/ParseTreeBuilder.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/ParseTreeBuilder.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/ParseTreeBuilder.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/ParseTreeBuilder.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/Profiler.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/Profiler.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/Profiler.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/Profiler.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/RemoteDebugEventSocketListener.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/RemoteDebugEventSocketListener.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/RemoteDebugEventSocketListener.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/RemoteDebugEventSocketListener.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/TraceDebugEventListener.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/TraceDebugEventListener.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/TraceDebugEventListener.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/TraceDebugEventListener.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/Tracer.java b/runtime/Java/src/main/java/org/antlr/runtime/debug/Tracer.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/debug/Tracer.java rename to runtime/Java/src/main/java/org/antlr/runtime/debug/Tracer.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/DoubleKeyMap.java b/runtime/Java/src/main/java/org/antlr/runtime/misc/DoubleKeyMap.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/DoubleKeyMap.java rename to runtime/Java/src/main/java/org/antlr/runtime/misc/DoubleKeyMap.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/FastQueue.java b/runtime/Java/src/main/java/org/antlr/runtime/misc/FastQueue.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/FastQueue.java rename to runtime/Java/src/main/java/org/antlr/runtime/misc/FastQueue.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/IntArray.java b/runtime/Java/src/main/java/org/antlr/runtime/misc/IntArray.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/IntArray.java rename to runtime/Java/src/main/java/org/antlr/runtime/misc/IntArray.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/LookaheadStream.java b/runtime/Java/src/main/java/org/antlr/runtime/misc/LookaheadStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/LookaheadStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/misc/LookaheadStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/Stats.java b/runtime/Java/src/main/java/org/antlr/runtime/misc/Stats.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/misc/Stats.java rename to runtime/Java/src/main/java/org/antlr/runtime/misc/Stats.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTree.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTree.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTree.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTree.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTreeAdaptor.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTreeAdaptor.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTreeAdaptor.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/BaseTreeAdaptor.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/BufferedTreeNodeStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/BufferedTreeNodeStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/BufferedTreeNodeStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/BufferedTreeNodeStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonErrorNode.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonErrorNode.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonErrorNode.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/CommonErrorNode.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTree.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTree.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTree.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTree.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeAdaptor.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeAdaptor.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeAdaptor.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeAdaptor.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeNodeStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeNodeStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeNodeStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/CommonTreeNodeStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/ParseTree.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/ParseTree.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/ParseTree.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/ParseTree.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteCardinalityException.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteCardinalityException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteCardinalityException.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteCardinalityException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEarlyExitException.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEarlyExitException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEarlyExitException.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEarlyExitException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEmptyStreamException.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEmptyStreamException.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEmptyStreamException.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteEmptyStreamException.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleElementStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleElementStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleElementStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleElementStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleNodeStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleNodeStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleNodeStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleNodeStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleSubtreeStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleSubtreeStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleSubtreeStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleSubtreeStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleTokenStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleTokenStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleTokenStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/RewriteRuleTokenStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/Tree.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/Tree.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/Tree.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/Tree.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeAdaptor.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeAdaptor.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeAdaptor.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeAdaptor.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeFilter.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeFilter.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeFilter.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeFilter.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeIterator.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeIterator.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeIterator.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeIterator.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeNodeStream.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeNodeStream.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeNodeStream.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeNodeStream.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeParser.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeParser.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeParser.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeParser.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternLexer.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternLexer.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternLexer.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternLexer.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternParser.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternParser.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternParser.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreePatternParser.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRewriter.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRewriter.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRewriter.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRewriter.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRuleReturnScope.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRuleReturnScope.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRuleReturnScope.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeRuleReturnScope.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitor.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitor.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitor.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitor.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitorAction.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitorAction.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitorAction.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeVisitorAction.java diff --git a/antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeWizard.java b/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeWizard.java similarity index 100% rename from antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/TreeWizard.java rename to runtime/Java/src/main/java/org/antlr/runtime/tree/TreeWizard.java diff --git a/antlr-3.4/runtime/JavaScript/AUTHORS b/runtime/JavaScript/AUTHORS similarity index 100% rename from antlr-3.4/runtime/JavaScript/AUTHORS rename to runtime/JavaScript/AUTHORS diff --git a/antlr-3.4/runtime/JavaScript/ChangeLog b/runtime/JavaScript/ChangeLog similarity index 100% rename from antlr-3.4/runtime/JavaScript/ChangeLog rename to runtime/JavaScript/ChangeLog diff --git a/antlr-3.4/runtime/JavaScript/build/README b/runtime/JavaScript/build/README similarity index 100% rename from antlr-3.4/runtime/JavaScript/build/README rename to runtime/JavaScript/build/README diff --git a/antlr-3.4/runtime/JavaScript/build/antlr3.properties b/runtime/JavaScript/build/antlr3.properties similarity index 100% rename from antlr-3.4/runtime/JavaScript/build/antlr3.properties rename to runtime/JavaScript/build/antlr3.properties diff --git a/antlr-3.4/runtime/JavaScript/build/build.xml b/runtime/JavaScript/build/build.xml similarity index 100% rename from antlr-3.4/runtime/JavaScript/build/build.xml rename to runtime/JavaScript/build/build.xml diff --git a/antlr-3.4/runtime/JavaScript/build/license.txt b/runtime/JavaScript/build/license.txt similarity index 100% rename from antlr-3.4/runtime/JavaScript/build/license.txt rename to runtime/JavaScript/build/license.txt diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr.js b/runtime/JavaScript/src/org/antlr.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr.js rename to runtime/JavaScript/src/org/antlr.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/ANTLRFileStream.js b/runtime/JavaScript/src/org/antlr/runtime/ANTLRFileStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/ANTLRFileStream.js rename to runtime/JavaScript/src/org/antlr/runtime/ANTLRFileStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/ANTLRStringStream.js b/runtime/JavaScript/src/org/antlr/runtime/ANTLRStringStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/ANTLRStringStream.js rename to runtime/JavaScript/src/org/antlr/runtime/ANTLRStringStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/BaseRecognizer.js b/runtime/JavaScript/src/org/antlr/runtime/BaseRecognizer.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/BaseRecognizer.js rename to runtime/JavaScript/src/org/antlr/runtime/BaseRecognizer.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/BitSet.js b/runtime/JavaScript/src/org/antlr/runtime/BitSet.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/BitSet.js rename to runtime/JavaScript/src/org/antlr/runtime/BitSet.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/CharStream.js b/runtime/JavaScript/src/org/antlr/runtime/CharStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/CharStream.js rename to runtime/JavaScript/src/org/antlr/runtime/CharStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/CommonToken.js b/runtime/JavaScript/src/org/antlr/runtime/CommonToken.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/CommonToken.js rename to runtime/JavaScript/src/org/antlr/runtime/CommonToken.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/CommonTokenStream.js b/runtime/JavaScript/src/org/antlr/runtime/CommonTokenStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/CommonTokenStream.js rename to runtime/JavaScript/src/org/antlr/runtime/CommonTokenStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/DFA.js b/runtime/JavaScript/src/org/antlr/runtime/DFA.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/DFA.js rename to runtime/JavaScript/src/org/antlr/runtime/DFA.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/EarlyExitException.js b/runtime/JavaScript/src/org/antlr/runtime/EarlyExitException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/EarlyExitException.js rename to runtime/JavaScript/src/org/antlr/runtime/EarlyExitException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/FailedPredicateException.js b/runtime/JavaScript/src/org/antlr/runtime/FailedPredicateException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/FailedPredicateException.js rename to runtime/JavaScript/src/org/antlr/runtime/FailedPredicateException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/IndexOutOfBoundsExceptions.js b/runtime/JavaScript/src/org/antlr/runtime/IndexOutOfBoundsExceptions.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/IndexOutOfBoundsExceptions.js rename to runtime/JavaScript/src/org/antlr/runtime/IndexOutOfBoundsExceptions.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/Lexer.js b/runtime/JavaScript/src/org/antlr/runtime/Lexer.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/Lexer.js rename to runtime/JavaScript/src/org/antlr/runtime/Lexer.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedNotSetException.js b/runtime/JavaScript/src/org/antlr/runtime/MismatchedNotSetException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedNotSetException.js rename to runtime/JavaScript/src/org/antlr/runtime/MismatchedNotSetException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedRangeExceptions.js b/runtime/JavaScript/src/org/antlr/runtime/MismatchedRangeExceptions.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedRangeExceptions.js rename to runtime/JavaScript/src/org/antlr/runtime/MismatchedRangeExceptions.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedSetException.js b/runtime/JavaScript/src/org/antlr/runtime/MismatchedSetException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedSetException.js rename to runtime/JavaScript/src/org/antlr/runtime/MismatchedSetException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedTokenException.js b/runtime/JavaScript/src/org/antlr/runtime/MismatchedTokenException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedTokenException.js rename to runtime/JavaScript/src/org/antlr/runtime/MismatchedTokenException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedTreeNodeException.js b/runtime/JavaScript/src/org/antlr/runtime/MismatchedTreeNodeException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MismatchedTreeNodeException.js rename to runtime/JavaScript/src/org/antlr/runtime/MismatchedTreeNodeException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MissingTokenException.js b/runtime/JavaScript/src/org/antlr/runtime/MissingTokenException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/MissingTokenException.js rename to runtime/JavaScript/src/org/antlr/runtime/MissingTokenException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/NoViableAltException.js b/runtime/JavaScript/src/org/antlr/runtime/NoViableAltException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/NoViableAltException.js rename to runtime/JavaScript/src/org/antlr/runtime/NoViableAltException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/Parser.js b/runtime/JavaScript/src/org/antlr/runtime/Parser.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/Parser.js rename to runtime/JavaScript/src/org/antlr/runtime/Parser.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/ParserRuleReturnScope.js b/runtime/JavaScript/src/org/antlr/runtime/ParserRuleReturnScope.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/ParserRuleReturnScope.js rename to runtime/JavaScript/src/org/antlr/runtime/ParserRuleReturnScope.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/RecognitionException.js b/runtime/JavaScript/src/org/antlr/runtime/RecognitionException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/RecognitionException.js rename to runtime/JavaScript/src/org/antlr/runtime/RecognitionException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/RecognizerSharedState.js b/runtime/JavaScript/src/org/antlr/runtime/RecognizerSharedState.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/RecognizerSharedState.js rename to runtime/JavaScript/src/org/antlr/runtime/RecognizerSharedState.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/Token.js b/runtime/JavaScript/src/org/antlr/runtime/Token.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/Token.js rename to runtime/JavaScript/src/org/antlr/runtime/Token.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/TokenRewriteStream.js b/runtime/JavaScript/src/org/antlr/runtime/TokenRewriteStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/TokenRewriteStream.js rename to runtime/JavaScript/src/org/antlr/runtime/TokenRewriteStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/UnwantedTokenException.js b/runtime/JavaScript/src/org/antlr/runtime/UnwantedTokenException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/UnwantedTokenException.js rename to runtime/JavaScript/src/org/antlr/runtime/UnwantedTokenException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/BaseTree.js b/runtime/JavaScript/src/org/antlr/runtime/tree/BaseTree.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/BaseTree.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/BaseTree.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/BaseTreeAdaptor.js b/runtime/JavaScript/src/org/antlr/runtime/tree/BaseTreeAdaptor.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/BaseTreeAdaptor.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/BaseTreeAdaptor.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonErrorNode.js b/runtime/JavaScript/src/org/antlr/runtime/tree/CommonErrorNode.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonErrorNode.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/CommonErrorNode.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTree.js b/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTree.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTree.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/CommonTree.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeAdaptor.js b/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeAdaptor.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeAdaptor.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeAdaptor.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeNodeStream.js b/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeNodeStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeNodeStream.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/CommonTreeNodeStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteCardinalityException.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteCardinalityException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteCardinalityException.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteCardinalityException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEarlyExitException.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEarlyExitException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEarlyExitException.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEarlyExitException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEmptyStreamException.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEmptyStreamException.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEmptyStreamException.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteEmptyStreamException.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleElementStream.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleElementStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleElementStream.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleElementStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleNodeStream.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleNodeStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleNodeStream.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleNodeStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleSubtreeStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleTokenStream.js b/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleTokenStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleTokenStream.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/RewriteRuleTokenStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/Tree.js b/runtime/JavaScript/src/org/antlr/runtime/tree/Tree.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/Tree.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/Tree.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/TreeNodeStream.js b/runtime/JavaScript/src/org/antlr/runtime/tree/TreeNodeStream.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/TreeNodeStream.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/TreeNodeStream.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/TreeParser.js b/runtime/JavaScript/src/org/antlr/runtime/tree/TreeParser.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/TreeParser.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/TreeParser.js diff --git a/antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/TreeRuleReturnScope.js b/runtime/JavaScript/src/org/antlr/runtime/tree/TreeRuleReturnScope.js similarity index 100% rename from antlr-3.4/runtime/JavaScript/src/org/antlr/runtime/tree/TreeRuleReturnScope.js rename to runtime/JavaScript/src/org/antlr/runtime/tree/TreeRuleReturnScope.js diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/Python.g b/runtime/JavaScript/tests/functional/Python.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/Python.g rename to runtime/JavaScript/tests/functional/Python.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/all.html b/runtime/JavaScript/tests/functional/all.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/all.html rename to runtime/JavaScript/tests/functional/all.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.extensions b/runtime/JavaScript/tests/functional/rhino-python.extensions similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.extensions rename to runtime/JavaScript/tests/functional/rhino-python.extensions diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.input b/runtime/JavaScript/tests/functional/rhino-python.input similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.input rename to runtime/JavaScript/tests/functional/rhino-python.input diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.output b/runtime/JavaScript/tests/functional/rhino-python.output similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.output rename to runtime/JavaScript/tests/functional/rhino-python.output diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.prog b/runtime/JavaScript/tests/functional/rhino-python.prog similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/rhino-python.prog rename to runtime/JavaScript/tests/functional/rhino-python.prog diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t001lexer.g b/runtime/JavaScript/tests/functional/t001lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t001lexer.g rename to runtime/JavaScript/tests/functional/t001lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t001lexer.html b/runtime/JavaScript/tests/functional/t001lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t001lexer.html rename to runtime/JavaScript/tests/functional/t001lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t002lexer.g b/runtime/JavaScript/tests/functional/t002lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t002lexer.g rename to runtime/JavaScript/tests/functional/t002lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t002lexer.html b/runtime/JavaScript/tests/functional/t002lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t002lexer.html rename to runtime/JavaScript/tests/functional/t002lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t003lexer.g b/runtime/JavaScript/tests/functional/t003lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t003lexer.g rename to runtime/JavaScript/tests/functional/t003lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t003lexer.html b/runtime/JavaScript/tests/functional/t003lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t003lexer.html rename to runtime/JavaScript/tests/functional/t003lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t004lexer.g b/runtime/JavaScript/tests/functional/t004lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t004lexer.g rename to runtime/JavaScript/tests/functional/t004lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t004lexer.html b/runtime/JavaScript/tests/functional/t004lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t004lexer.html rename to runtime/JavaScript/tests/functional/t004lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t005lexer.g b/runtime/JavaScript/tests/functional/t005lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t005lexer.g rename to runtime/JavaScript/tests/functional/t005lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t005lexer.html b/runtime/JavaScript/tests/functional/t005lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t005lexer.html rename to runtime/JavaScript/tests/functional/t005lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t006lexer.g b/runtime/JavaScript/tests/functional/t006lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t006lexer.g rename to runtime/JavaScript/tests/functional/t006lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t006lexer.html b/runtime/JavaScript/tests/functional/t006lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t006lexer.html rename to runtime/JavaScript/tests/functional/t006lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t007lexer.g b/runtime/JavaScript/tests/functional/t007lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t007lexer.g rename to runtime/JavaScript/tests/functional/t007lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t007lexer.html b/runtime/JavaScript/tests/functional/t007lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t007lexer.html rename to runtime/JavaScript/tests/functional/t007lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t008lexer.g b/runtime/JavaScript/tests/functional/t008lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t008lexer.g rename to runtime/JavaScript/tests/functional/t008lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t008lexer.html b/runtime/JavaScript/tests/functional/t008lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t008lexer.html rename to runtime/JavaScript/tests/functional/t008lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t009lexer.g b/runtime/JavaScript/tests/functional/t009lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t009lexer.g rename to runtime/JavaScript/tests/functional/t009lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t009lexer.html b/runtime/JavaScript/tests/functional/t009lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t009lexer.html rename to runtime/JavaScript/tests/functional/t009lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t010lexer.g b/runtime/JavaScript/tests/functional/t010lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t010lexer.g rename to runtime/JavaScript/tests/functional/t010lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t010lexer.html b/runtime/JavaScript/tests/functional/t010lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t010lexer.html rename to runtime/JavaScript/tests/functional/t010lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t011lexer.g b/runtime/JavaScript/tests/functional/t011lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t011lexer.g rename to runtime/JavaScript/tests/functional/t011lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t011lexer.html b/runtime/JavaScript/tests/functional/t011lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t011lexer.html rename to runtime/JavaScript/tests/functional/t011lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t012lexerXML.g b/runtime/JavaScript/tests/functional/t012lexerXML.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t012lexerXML.g rename to runtime/JavaScript/tests/functional/t012lexerXML.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t012lexerXML.html b/runtime/JavaScript/tests/functional/t012lexerXML.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t012lexerXML.html rename to runtime/JavaScript/tests/functional/t012lexerXML.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t013parser.g b/runtime/JavaScript/tests/functional/t013parser.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t013parser.g rename to runtime/JavaScript/tests/functional/t013parser.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t013parser.html b/runtime/JavaScript/tests/functional/t013parser.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t013parser.html rename to runtime/JavaScript/tests/functional/t013parser.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t014parser.g b/runtime/JavaScript/tests/functional/t014parser.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t014parser.g rename to runtime/JavaScript/tests/functional/t014parser.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t014parser.html b/runtime/JavaScript/tests/functional/t014parser.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t014parser.html rename to runtime/JavaScript/tests/functional/t014parser.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t015calc.g b/runtime/JavaScript/tests/functional/t015calc.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t015calc.g rename to runtime/JavaScript/tests/functional/t015calc.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t015calc.html b/runtime/JavaScript/tests/functional/t015calc.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t015calc.html rename to runtime/JavaScript/tests/functional/t015calc.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t016actions.g b/runtime/JavaScript/tests/functional/t016actions.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t016actions.g rename to runtime/JavaScript/tests/functional/t016actions.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t016actions.html b/runtime/JavaScript/tests/functional/t016actions.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t016actions.html rename to runtime/JavaScript/tests/functional/t016actions.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t017parser.g b/runtime/JavaScript/tests/functional/t017parser.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t017parser.g rename to runtime/JavaScript/tests/functional/t017parser.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t017parser.html b/runtime/JavaScript/tests/functional/t017parser.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t017parser.html rename to runtime/JavaScript/tests/functional/t017parser.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t018llstar.g b/runtime/JavaScript/tests/functional/t018llstar.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t018llstar.g rename to runtime/JavaScript/tests/functional/t018llstar.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t018llstar.html b/runtime/JavaScript/tests/functional/t018llstar.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t018llstar.html rename to runtime/JavaScript/tests/functional/t018llstar.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t019lexer.g b/runtime/JavaScript/tests/functional/t019lexer.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t019lexer.g rename to runtime/JavaScript/tests/functional/t019lexer.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t019lexer.html b/runtime/JavaScript/tests/functional/t019lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t019lexer.html rename to runtime/JavaScript/tests/functional/t019lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t020fuzzy.g b/runtime/JavaScript/tests/functional/t020fuzzy.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t020fuzzy.g rename to runtime/JavaScript/tests/functional/t020fuzzy.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t020fuzzy.html b/runtime/JavaScript/tests/functional/t020fuzzy.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t020fuzzy.html rename to runtime/JavaScript/tests/functional/t020fuzzy.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t021hoist.g b/runtime/JavaScript/tests/functional/t021hoist.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t021hoist.g rename to runtime/JavaScript/tests/functional/t021hoist.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t021hoist.html b/runtime/JavaScript/tests/functional/t021hoist.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t021hoist.html rename to runtime/JavaScript/tests/functional/t021hoist.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t022scopes.g b/runtime/JavaScript/tests/functional/t022scopes.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t022scopes.g rename to runtime/JavaScript/tests/functional/t022scopes.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t022scopes.html b/runtime/JavaScript/tests/functional/t022scopes.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t022scopes.html rename to runtime/JavaScript/tests/functional/t022scopes.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t023scopes.g b/runtime/JavaScript/tests/functional/t023scopes.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t023scopes.g rename to runtime/JavaScript/tests/functional/t023scopes.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t023scopes.html b/runtime/JavaScript/tests/functional/t023scopes.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t023scopes.html rename to runtime/JavaScript/tests/functional/t023scopes.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t024finally.g b/runtime/JavaScript/tests/functional/t024finally.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t024finally.g rename to runtime/JavaScript/tests/functional/t024finally.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t024finally.html b/runtime/JavaScript/tests/functional/t024finally.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t024finally.html rename to runtime/JavaScript/tests/functional/t024finally.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.g b/runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.g rename to runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.html b/runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.html rename to runtime/JavaScript/tests/functional/t025lexerRulePropertyRef.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t026actions.g b/runtime/JavaScript/tests/functional/t026actions.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t026actions.g rename to runtime/JavaScript/tests/functional/t026actions.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t026actions.html b/runtime/JavaScript/tests/functional/t026actions.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t026actions.html rename to runtime/JavaScript/tests/functional/t026actions.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t027eof.g b/runtime/JavaScript/tests/functional/t027eof.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t027eof.g rename to runtime/JavaScript/tests/functional/t027eof.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t027eof.html b/runtime/JavaScript/tests/functional/t027eof.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t027eof.html rename to runtime/JavaScript/tests/functional/t027eof.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t029synpredgate.g b/runtime/JavaScript/tests/functional/t029synpredgate.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t029synpredgate.g rename to runtime/JavaScript/tests/functional/t029synpredgate.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t029synpredgate.html b/runtime/JavaScript/tests/functional/t029synpredgate.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t029synpredgate.html rename to runtime/JavaScript/tests/functional/t029synpredgate.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t030specialStates.g b/runtime/JavaScript/tests/functional/t030specialStates.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t030specialStates.g rename to runtime/JavaScript/tests/functional/t030specialStates.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t030specialStates.html b/runtime/JavaScript/tests/functional/t030specialStates.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t030specialStates.html rename to runtime/JavaScript/tests/functional/t030specialStates.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t031emptyAlt.g b/runtime/JavaScript/tests/functional/t031emptyAlt.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t031emptyAlt.g rename to runtime/JavaScript/tests/functional/t031emptyAlt.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t031emptyAlt.html b/runtime/JavaScript/tests/functional/t031emptyAlt.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t031emptyAlt.html rename to runtime/JavaScript/tests/functional/t031emptyAlt.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t032subrulePredict.g b/runtime/JavaScript/tests/functional/t032subrulePredict.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t032subrulePredict.g rename to runtime/JavaScript/tests/functional/t032subrulePredict.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t032subrulePredict.html b/runtime/JavaScript/tests/functional/t032subrulePredict.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t032subrulePredict.html rename to runtime/JavaScript/tests/functional/t032subrulePredict.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t033backtracking.g b/runtime/JavaScript/tests/functional/t033backtracking.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t033backtracking.g rename to runtime/JavaScript/tests/functional/t033backtracking.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t033backtracking.html b/runtime/JavaScript/tests/functional/t033backtracking.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t033backtracking.html rename to runtime/JavaScript/tests/functional/t033backtracking.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.g b/runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.g rename to runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.html b/runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.html rename to runtime/JavaScript/tests/functional/t034tokenLabelPropertyRef.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.g b/runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.g rename to runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.html b/runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.html rename to runtime/JavaScript/tests/functional/t035ruleLabelPropertyRef.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t036multipleReturnValues.g b/runtime/JavaScript/tests/functional/t036multipleReturnValues.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t036multipleReturnValues.g rename to runtime/JavaScript/tests/functional/t036multipleReturnValues.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t036multipleReturnValues.html b/runtime/JavaScript/tests/functional/t036multipleReturnValues.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t036multipleReturnValues.html rename to runtime/JavaScript/tests/functional/t036multipleReturnValues.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t037rulePropertyRef.g b/runtime/JavaScript/tests/functional/t037rulePropertyRef.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t037rulePropertyRef.g rename to runtime/JavaScript/tests/functional/t037rulePropertyRef.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t037rulePropertyRef.html b/runtime/JavaScript/tests/functional/t037rulePropertyRef.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t037rulePropertyRef.html rename to runtime/JavaScript/tests/functional/t037rulePropertyRef.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t038lexerRuleLabel.g b/runtime/JavaScript/tests/functional/t038lexerRuleLabel.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t038lexerRuleLabel.g rename to runtime/JavaScript/tests/functional/t038lexerRuleLabel.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t038lexerRuleLabel.html b/runtime/JavaScript/tests/functional/t038lexerRuleLabel.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t038lexerRuleLabel.html rename to runtime/JavaScript/tests/functional/t038lexerRuleLabel.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t039labels.g b/runtime/JavaScript/tests/functional/t039labels.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t039labels.g rename to runtime/JavaScript/tests/functional/t039labels.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t039labels.html b/runtime/JavaScript/tests/functional/t039labels.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t039labels.html rename to runtime/JavaScript/tests/functional/t039labels.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t040bug80.g b/runtime/JavaScript/tests/functional/t040bug80.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t040bug80.g rename to runtime/JavaScript/tests/functional/t040bug80.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t040bug80.html b/runtime/JavaScript/tests/functional/t040bug80.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t040bug80.html rename to runtime/JavaScript/tests/functional/t040bug80.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t041parameters.g b/runtime/JavaScript/tests/functional/t041parameters.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t041parameters.g rename to runtime/JavaScript/tests/functional/t041parameters.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t041parameters.html b/runtime/JavaScript/tests/functional/t041parameters.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t041parameters.html rename to runtime/JavaScript/tests/functional/t041parameters.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t042ast.g b/runtime/JavaScript/tests/functional/t042ast.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t042ast.g rename to runtime/JavaScript/tests/functional/t042ast.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t042ast.html b/runtime/JavaScript/tests/functional/t042ast.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t042ast.html rename to runtime/JavaScript/tests/functional/t042ast.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t043synpred.g b/runtime/JavaScript/tests/functional/t043synpred.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t043synpred.g rename to runtime/JavaScript/tests/functional/t043synpred.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t043synpred.html b/runtime/JavaScript/tests/functional/t043synpred.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t043synpred.html rename to runtime/JavaScript/tests/functional/t043synpred.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t044trace.g b/runtime/JavaScript/tests/functional/t044trace.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t044trace.g rename to runtime/JavaScript/tests/functional/t044trace.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t044trace.html b/runtime/JavaScript/tests/functional/t044trace.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t044trace.html rename to runtime/JavaScript/tests/functional/t044trace.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t045dfabug.g b/runtime/JavaScript/tests/functional/t045dfabug.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t045dfabug.g rename to runtime/JavaScript/tests/functional/t045dfabug.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t045dfabug.html b/runtime/JavaScript/tests/functional/t045dfabug.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t045dfabug.html rename to runtime/JavaScript/tests/functional/t045dfabug.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t046rewrite.g b/runtime/JavaScript/tests/functional/t046rewrite.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t046rewrite.g rename to runtime/JavaScript/tests/functional/t046rewrite.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t046rewrite.html b/runtime/JavaScript/tests/functional/t046rewrite.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t046rewrite.html rename to runtime/JavaScript/tests/functional/t046rewrite.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t047treeparser.g b/runtime/JavaScript/tests/functional/t047treeparser.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t047treeparser.g rename to runtime/JavaScript/tests/functional/t047treeparser.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t047treeparser.html b/runtime/JavaScript/tests/functional/t047treeparser.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t047treeparser.html rename to runtime/JavaScript/tests/functional/t047treeparser.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t047treeparserWalker.g b/runtime/JavaScript/tests/functional/t047treeparserWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t047treeparserWalker.g rename to runtime/JavaScript/tests/functional/t047treeparserWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t048rewrite.g b/runtime/JavaScript/tests/functional/t048rewrite.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t048rewrite.g rename to runtime/JavaScript/tests/functional/t048rewrite.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t048rewrite.html b/runtime/JavaScript/tests/functional/t048rewrite.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t048rewrite.html rename to runtime/JavaScript/tests/functional/t048rewrite.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparser.html b/runtime/JavaScript/tests/functional/t049treeparser.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparser.html rename to runtime/JavaScript/tests/functional/t049treeparser.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsera.g b/runtime/JavaScript/tests/functional/t049treeparsera.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsera.g rename to runtime/JavaScript/tests/functional/t049treeparsera.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparseraWalker.g b/runtime/JavaScript/tests/functional/t049treeparseraWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparseraWalker.g rename to runtime/JavaScript/tests/functional/t049treeparseraWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserb.g b/runtime/JavaScript/tests/functional/t049treeparserb.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserb.g rename to runtime/JavaScript/tests/functional/t049treeparserb.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserbWalker.g b/runtime/JavaScript/tests/functional/t049treeparserbWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserbWalker.g rename to runtime/JavaScript/tests/functional/t049treeparserbWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserc.g b/runtime/JavaScript/tests/functional/t049treeparserc.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserc.g rename to runtime/JavaScript/tests/functional/t049treeparserc.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsercWalker.g b/runtime/JavaScript/tests/functional/t049treeparsercWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsercWalker.g rename to runtime/JavaScript/tests/functional/t049treeparsercWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserd.g b/runtime/JavaScript/tests/functional/t049treeparserd.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserd.g rename to runtime/JavaScript/tests/functional/t049treeparserd.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserdWalker.g b/runtime/JavaScript/tests/functional/t049treeparserdWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserdWalker.g rename to runtime/JavaScript/tests/functional/t049treeparserdWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsere.g b/runtime/JavaScript/tests/functional/t049treeparsere.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsere.g rename to runtime/JavaScript/tests/functional/t049treeparsere.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsereWalker.g b/runtime/JavaScript/tests/functional/t049treeparsereWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsereWalker.g rename to runtime/JavaScript/tests/functional/t049treeparsereWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserf.g b/runtime/JavaScript/tests/functional/t049treeparserf.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserf.g rename to runtime/JavaScript/tests/functional/t049treeparserf.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserfWalker.g b/runtime/JavaScript/tests/functional/t049treeparserfWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserfWalker.g rename to runtime/JavaScript/tests/functional/t049treeparserfWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserg.g b/runtime/JavaScript/tests/functional/t049treeparserg.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserg.g rename to runtime/JavaScript/tests/functional/t049treeparserg.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsergWalker.g b/runtime/JavaScript/tests/functional/t049treeparsergWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparsergWalker.g rename to runtime/JavaScript/tests/functional/t049treeparsergWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserh.g b/runtime/JavaScript/tests/functional/t049treeparserh.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserh.g rename to runtime/JavaScript/tests/functional/t049treeparserh.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserhWalker.g b/runtime/JavaScript/tests/functional/t049treeparserhWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparserhWalker.g rename to runtime/JavaScript/tests/functional/t049treeparserhWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparseri.g b/runtime/JavaScript/tests/functional/t049treeparseri.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparseri.g rename to runtime/JavaScript/tests/functional/t049treeparseri.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t049treeparseriWalker.g b/runtime/JavaScript/tests/functional/t049treeparseriWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t049treeparseriWalker.g rename to runtime/JavaScript/tests/functional/t049treeparseriWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteAST.html b/runtime/JavaScript/tests/functional/t051treeRewriteAST.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteAST.html rename to runtime/JavaScript/tests/functional/t051treeRewriteAST.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTa.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTa.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTa.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTa.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTaWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTaWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTaWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTaWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTaa.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTaa.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTaa.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTaa.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTaaWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTaaWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTaaWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTaaWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTab.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTab.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTab.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTab.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTabWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTabWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTabWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTabWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTac.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTac.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTac.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTac.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTacWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTacWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTacWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTacWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTb.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTb.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTb.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTb.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTbWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTbWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTbWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTbWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTc.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTc.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTc.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTc.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTcWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTcWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTcWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTcWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTd.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTd.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTd.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTd.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTdWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTdWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTdWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTdWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTe.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTe.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTe.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTe.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTeWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTeWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTeWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTeWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTf.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTf.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTf.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTf.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTfWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTfWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTfWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTfWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTg.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTg.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTg.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTg.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTgWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTgWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTgWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTgWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTh.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTh.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTh.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTh.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASThWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASThWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASThWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASThWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTi.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTi.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTi.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTi.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTiWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTiWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTiWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTiWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTj.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTj.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTj.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTj.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTjWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTjWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTjWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTjWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTk.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTk.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTk.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTk.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTkWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTkWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTkWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTkWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTl.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTl.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTl.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTl.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTlWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTlWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTlWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTlWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTm.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTm.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTm.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTm.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTmWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTmWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTmWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTmWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTn.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTn.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTn.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTn.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTnWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTnWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTnWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTnWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTo.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTo.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTo.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTo.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASToWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASToWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASToWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASToWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTp.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTp.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTp.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTp.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTpWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTpWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTpWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTpWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTq.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTq.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTq.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTq.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTqWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTqWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTqWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTqWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTr.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTr.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTr.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTr.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTrWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTrWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTrWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTrWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTs.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTs.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTs.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTs.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTsWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTsWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTsWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTsWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTt.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTt.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTt.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTt.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTtWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTtWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTtWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTtWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTu.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTu.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTu.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTu.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTuWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTuWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTuWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTuWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTv.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTv.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTv.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTv.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTvWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTvWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTvWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTvWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTw.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTw.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTw.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTw.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTwWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTwWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTwWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTwWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTx.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTx.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTx.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTx.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTxWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTxWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTxWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTxWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTy.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTy.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTy.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTy.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTyWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTyWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTyWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTyWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTz.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTz.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTz.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTz.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTzWalker.g b/runtime/JavaScript/tests/functional/t051treeRewriteASTzWalker.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t051treeRewriteASTzWalker.g rename to runtime/JavaScript/tests/functional/t051treeRewriteASTzWalker.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052import.html b/runtime/JavaScript/tests/functional/t052import.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052import.html rename to runtime/JavaScript/tests/functional/t052import.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM1.g b/runtime/JavaScript/tests/functional/t052importM1.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM1.g rename to runtime/JavaScript/tests/functional/t052importM1.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM2.g b/runtime/JavaScript/tests/functional/t052importM2.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM2.g rename to runtime/JavaScript/tests/functional/t052importM2.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM3.g b/runtime/JavaScript/tests/functional/t052importM3.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM3.g rename to runtime/JavaScript/tests/functional/t052importM3.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM4.g b/runtime/JavaScript/tests/functional/t052importM4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM4.g rename to runtime/JavaScript/tests/functional/t052importM4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM5.g b/runtime/JavaScript/tests/functional/t052importM5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM5.g rename to runtime/JavaScript/tests/functional/t052importM5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM6.g b/runtime/JavaScript/tests/functional/t052importM6.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM6.g rename to runtime/JavaScript/tests/functional/t052importM6.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM7.g b/runtime/JavaScript/tests/functional/t052importM7.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM7.g rename to runtime/JavaScript/tests/functional/t052importM7.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importM8.g b/runtime/JavaScript/tests/functional/t052importM8.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importM8.g rename to runtime/JavaScript/tests/functional/t052importM8.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS1.g b/runtime/JavaScript/tests/functional/t052importS1.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS1.g rename to runtime/JavaScript/tests/functional/t052importS1.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS2.g b/runtime/JavaScript/tests/functional/t052importS2.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS2.g rename to runtime/JavaScript/tests/functional/t052importS2.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS3.g b/runtime/JavaScript/tests/functional/t052importS3.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS3.g rename to runtime/JavaScript/tests/functional/t052importS3.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS4.g b/runtime/JavaScript/tests/functional/t052importS4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS4.g rename to runtime/JavaScript/tests/functional/t052importS4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS5.g b/runtime/JavaScript/tests/functional/t052importS5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS5.g rename to runtime/JavaScript/tests/functional/t052importS5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS6.g b/runtime/JavaScript/tests/functional/t052importS6.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS6.g rename to runtime/JavaScript/tests/functional/t052importS6.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS7.g b/runtime/JavaScript/tests/functional/t052importS7.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS7.g rename to runtime/JavaScript/tests/functional/t052importS7.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importS8.g b/runtime/JavaScript/tests/functional/t052importS8.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importS8.g rename to runtime/JavaScript/tests/functional/t052importS8.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importT4.g b/runtime/JavaScript/tests/functional/t052importT4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importT4.g rename to runtime/JavaScript/tests/functional/t052importT4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t052importT5.g b/runtime/JavaScript/tests/functional/t052importT5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t052importT5.g rename to runtime/JavaScript/tests/functional/t052importT5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053hetero.html b/runtime/JavaScript/tests/functional/t053hetero.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053hetero.html rename to runtime/JavaScript/tests/functional/t053hetero.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT.g b/runtime/JavaScript/tests/functional/t053heteroT.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT.g rename to runtime/JavaScript/tests/functional/t053heteroT.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT1.g b/runtime/JavaScript/tests/functional/t053heteroT1.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT1.g rename to runtime/JavaScript/tests/functional/t053heteroT1.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT10.g b/runtime/JavaScript/tests/functional/t053heteroT10.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT10.g rename to runtime/JavaScript/tests/functional/t053heteroT10.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT11.g b/runtime/JavaScript/tests/functional/t053heteroT11.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT11.g rename to runtime/JavaScript/tests/functional/t053heteroT11.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT12.g b/runtime/JavaScript/tests/functional/t053heteroT12.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT12.g rename to runtime/JavaScript/tests/functional/t053heteroT12.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT13.g b/runtime/JavaScript/tests/functional/t053heteroT13.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT13.g rename to runtime/JavaScript/tests/functional/t053heteroT13.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT14.g b/runtime/JavaScript/tests/functional/t053heteroT14.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT14.g rename to runtime/JavaScript/tests/functional/t053heteroT14.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT15.g b/runtime/JavaScript/tests/functional/t053heteroT15.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT15.g rename to runtime/JavaScript/tests/functional/t053heteroT15.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT16.g b/runtime/JavaScript/tests/functional/t053heteroT16.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT16.g rename to runtime/JavaScript/tests/functional/t053heteroT16.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT17.g b/runtime/JavaScript/tests/functional/t053heteroT17.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT17.g rename to runtime/JavaScript/tests/functional/t053heteroT17.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT18.g b/runtime/JavaScript/tests/functional/t053heteroT18.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT18.g rename to runtime/JavaScript/tests/functional/t053heteroT18.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT2.g b/runtime/JavaScript/tests/functional/t053heteroT2.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT2.g rename to runtime/JavaScript/tests/functional/t053heteroT2.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT3.g b/runtime/JavaScript/tests/functional/t053heteroT3.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT3.g rename to runtime/JavaScript/tests/functional/t053heteroT3.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT4.g b/runtime/JavaScript/tests/functional/t053heteroT4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT4.g rename to runtime/JavaScript/tests/functional/t053heteroT4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT5.g b/runtime/JavaScript/tests/functional/t053heteroT5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT5.g rename to runtime/JavaScript/tests/functional/t053heteroT5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT6.g b/runtime/JavaScript/tests/functional/t053heteroT6.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT6.g rename to runtime/JavaScript/tests/functional/t053heteroT6.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT7.g b/runtime/JavaScript/tests/functional/t053heteroT7.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT7.g rename to runtime/JavaScript/tests/functional/t053heteroT7.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT8.g b/runtime/JavaScript/tests/functional/t053heteroT8.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT8.g rename to runtime/JavaScript/tests/functional/t053heteroT8.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT9.g b/runtime/JavaScript/tests/functional/t053heteroT9.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroT9.g rename to runtime/JavaScript/tests/functional/t053heteroT9.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP.g b/runtime/JavaScript/tests/functional/t053heteroTP.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP.g rename to runtime/JavaScript/tests/functional/t053heteroTP.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP13.g b/runtime/JavaScript/tests/functional/t053heteroTP13.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP13.g rename to runtime/JavaScript/tests/functional/t053heteroTP13.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP14.g b/runtime/JavaScript/tests/functional/t053heteroTP14.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP14.g rename to runtime/JavaScript/tests/functional/t053heteroTP14.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP15.g b/runtime/JavaScript/tests/functional/t053heteroTP15.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP15.g rename to runtime/JavaScript/tests/functional/t053heteroTP15.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP16.g b/runtime/JavaScript/tests/functional/t053heteroTP16.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP16.g rename to runtime/JavaScript/tests/functional/t053heteroTP16.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP17.g b/runtime/JavaScript/tests/functional/t053heteroTP17.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP17.g rename to runtime/JavaScript/tests/functional/t053heteroTP17.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP18.g b/runtime/JavaScript/tests/functional/t053heteroTP18.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t053heteroTP18.g rename to runtime/JavaScript/tests/functional/t053heteroTP18.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer.html b/runtime/JavaScript/tests/functional/t056lexer.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer.html rename to runtime/JavaScript/tests/functional/t056lexer.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer1.g b/runtime/JavaScript/tests/functional/t056lexer1.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer1.g rename to runtime/JavaScript/tests/functional/t056lexer1.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer10.g b/runtime/JavaScript/tests/functional/t056lexer10.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer10.g rename to runtime/JavaScript/tests/functional/t056lexer10.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer11.g b/runtime/JavaScript/tests/functional/t056lexer11.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer11.g rename to runtime/JavaScript/tests/functional/t056lexer11.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer12.g b/runtime/JavaScript/tests/functional/t056lexer12.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer12.g rename to runtime/JavaScript/tests/functional/t056lexer12.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer13.g b/runtime/JavaScript/tests/functional/t056lexer13.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer13.g rename to runtime/JavaScript/tests/functional/t056lexer13.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer14.g b/runtime/JavaScript/tests/functional/t056lexer14.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer14.g rename to runtime/JavaScript/tests/functional/t056lexer14.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer15.g b/runtime/JavaScript/tests/functional/t056lexer15.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer15.g rename to runtime/JavaScript/tests/functional/t056lexer15.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer2.g b/runtime/JavaScript/tests/functional/t056lexer2.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer2.g rename to runtime/JavaScript/tests/functional/t056lexer2.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer3.g b/runtime/JavaScript/tests/functional/t056lexer3.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer3.g rename to runtime/JavaScript/tests/functional/t056lexer3.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer4.g b/runtime/JavaScript/tests/functional/t056lexer4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer4.g rename to runtime/JavaScript/tests/functional/t056lexer4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer5.g b/runtime/JavaScript/tests/functional/t056lexer5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer5.g rename to runtime/JavaScript/tests/functional/t056lexer5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer6.g b/runtime/JavaScript/tests/functional/t056lexer6.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer6.g rename to runtime/JavaScript/tests/functional/t056lexer6.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer7.g b/runtime/JavaScript/tests/functional/t056lexer7.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer7.g rename to runtime/JavaScript/tests/functional/t056lexer7.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer8.g b/runtime/JavaScript/tests/functional/t056lexer8.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer8.g rename to runtime/JavaScript/tests/functional/t056lexer8.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t056lexer9.g b/runtime/JavaScript/tests/functional/t056lexer9.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t056lexer9.g rename to runtime/JavaScript/tests/functional/t056lexer9.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST.html b/runtime/JavaScript/tests/functional/t057autoAST.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST.html rename to runtime/JavaScript/tests/functional/t057autoAST.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST1.g b/runtime/JavaScript/tests/functional/t057autoAST1.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST1.g rename to runtime/JavaScript/tests/functional/t057autoAST1.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST10.g b/runtime/JavaScript/tests/functional/t057autoAST10.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST10.g rename to runtime/JavaScript/tests/functional/t057autoAST10.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST11.g b/runtime/JavaScript/tests/functional/t057autoAST11.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST11.g rename to runtime/JavaScript/tests/functional/t057autoAST11.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST12.g b/runtime/JavaScript/tests/functional/t057autoAST12.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST12.g rename to runtime/JavaScript/tests/functional/t057autoAST12.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST13.g b/runtime/JavaScript/tests/functional/t057autoAST13.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST13.g rename to runtime/JavaScript/tests/functional/t057autoAST13.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST14.g b/runtime/JavaScript/tests/functional/t057autoAST14.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST14.g rename to runtime/JavaScript/tests/functional/t057autoAST14.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST15.g b/runtime/JavaScript/tests/functional/t057autoAST15.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST15.g rename to runtime/JavaScript/tests/functional/t057autoAST15.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST16.g b/runtime/JavaScript/tests/functional/t057autoAST16.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST16.g rename to runtime/JavaScript/tests/functional/t057autoAST16.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST17.g b/runtime/JavaScript/tests/functional/t057autoAST17.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST17.g rename to runtime/JavaScript/tests/functional/t057autoAST17.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST18.g b/runtime/JavaScript/tests/functional/t057autoAST18.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST18.g rename to runtime/JavaScript/tests/functional/t057autoAST18.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST19.g b/runtime/JavaScript/tests/functional/t057autoAST19.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST19.g rename to runtime/JavaScript/tests/functional/t057autoAST19.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST2.g b/runtime/JavaScript/tests/functional/t057autoAST2.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST2.g rename to runtime/JavaScript/tests/functional/t057autoAST2.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST20.g b/runtime/JavaScript/tests/functional/t057autoAST20.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST20.g rename to runtime/JavaScript/tests/functional/t057autoAST20.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST21.g b/runtime/JavaScript/tests/functional/t057autoAST21.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST21.g rename to runtime/JavaScript/tests/functional/t057autoAST21.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST22.g b/runtime/JavaScript/tests/functional/t057autoAST22.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST22.g rename to runtime/JavaScript/tests/functional/t057autoAST22.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST23.g b/runtime/JavaScript/tests/functional/t057autoAST23.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST23.g rename to runtime/JavaScript/tests/functional/t057autoAST23.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST24.g b/runtime/JavaScript/tests/functional/t057autoAST24.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST24.g rename to runtime/JavaScript/tests/functional/t057autoAST24.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST25.g b/runtime/JavaScript/tests/functional/t057autoAST25.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST25.g rename to runtime/JavaScript/tests/functional/t057autoAST25.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST26.g b/runtime/JavaScript/tests/functional/t057autoAST26.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST26.g rename to runtime/JavaScript/tests/functional/t057autoAST26.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST27.g b/runtime/JavaScript/tests/functional/t057autoAST27.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST27.g rename to runtime/JavaScript/tests/functional/t057autoAST27.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST28.g b/runtime/JavaScript/tests/functional/t057autoAST28.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST28.g rename to runtime/JavaScript/tests/functional/t057autoAST28.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST29.g b/runtime/JavaScript/tests/functional/t057autoAST29.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST29.g rename to runtime/JavaScript/tests/functional/t057autoAST29.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST3.g b/runtime/JavaScript/tests/functional/t057autoAST3.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST3.g rename to runtime/JavaScript/tests/functional/t057autoAST3.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST30.g b/runtime/JavaScript/tests/functional/t057autoAST30.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST30.g rename to runtime/JavaScript/tests/functional/t057autoAST30.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST31.g b/runtime/JavaScript/tests/functional/t057autoAST31.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST31.g rename to runtime/JavaScript/tests/functional/t057autoAST31.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST32.g b/runtime/JavaScript/tests/functional/t057autoAST32.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST32.g rename to runtime/JavaScript/tests/functional/t057autoAST32.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST33.g b/runtime/JavaScript/tests/functional/t057autoAST33.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST33.g rename to runtime/JavaScript/tests/functional/t057autoAST33.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST34.g b/runtime/JavaScript/tests/functional/t057autoAST34.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST34.g rename to runtime/JavaScript/tests/functional/t057autoAST34.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST35.g b/runtime/JavaScript/tests/functional/t057autoAST35.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST35.g rename to runtime/JavaScript/tests/functional/t057autoAST35.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST36.g b/runtime/JavaScript/tests/functional/t057autoAST36.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST36.g rename to runtime/JavaScript/tests/functional/t057autoAST36.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST37.g b/runtime/JavaScript/tests/functional/t057autoAST37.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST37.g rename to runtime/JavaScript/tests/functional/t057autoAST37.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST38.g b/runtime/JavaScript/tests/functional/t057autoAST38.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST38.g rename to runtime/JavaScript/tests/functional/t057autoAST38.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST39.g b/runtime/JavaScript/tests/functional/t057autoAST39.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST39.g rename to runtime/JavaScript/tests/functional/t057autoAST39.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST4.g b/runtime/JavaScript/tests/functional/t057autoAST4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST4.g rename to runtime/JavaScript/tests/functional/t057autoAST4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST40.g b/runtime/JavaScript/tests/functional/t057autoAST40.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST40.g rename to runtime/JavaScript/tests/functional/t057autoAST40.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST41.g b/runtime/JavaScript/tests/functional/t057autoAST41.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST41.g rename to runtime/JavaScript/tests/functional/t057autoAST41.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST42.g b/runtime/JavaScript/tests/functional/t057autoAST42.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST42.g rename to runtime/JavaScript/tests/functional/t057autoAST42.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST43.g b/runtime/JavaScript/tests/functional/t057autoAST43.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST43.g rename to runtime/JavaScript/tests/functional/t057autoAST43.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST44.g b/runtime/JavaScript/tests/functional/t057autoAST44.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST44.g rename to runtime/JavaScript/tests/functional/t057autoAST44.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST45.g b/runtime/JavaScript/tests/functional/t057autoAST45.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST45.g rename to runtime/JavaScript/tests/functional/t057autoAST45.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST46.g b/runtime/JavaScript/tests/functional/t057autoAST46.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST46.g rename to runtime/JavaScript/tests/functional/t057autoAST46.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST47.g b/runtime/JavaScript/tests/functional/t057autoAST47.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST47.g rename to runtime/JavaScript/tests/functional/t057autoAST47.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST48.g b/runtime/JavaScript/tests/functional/t057autoAST48.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST48.g rename to runtime/JavaScript/tests/functional/t057autoAST48.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST49.g b/runtime/JavaScript/tests/functional/t057autoAST49.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST49.g rename to runtime/JavaScript/tests/functional/t057autoAST49.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST5.g b/runtime/JavaScript/tests/functional/t057autoAST5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST5.g rename to runtime/JavaScript/tests/functional/t057autoAST5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST50.g b/runtime/JavaScript/tests/functional/t057autoAST50.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST50.g rename to runtime/JavaScript/tests/functional/t057autoAST50.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST51.g b/runtime/JavaScript/tests/functional/t057autoAST51.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST51.g rename to runtime/JavaScript/tests/functional/t057autoAST51.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST52.g b/runtime/JavaScript/tests/functional/t057autoAST52.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST52.g rename to runtime/JavaScript/tests/functional/t057autoAST52.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST53.g b/runtime/JavaScript/tests/functional/t057autoAST53.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST53.g rename to runtime/JavaScript/tests/functional/t057autoAST53.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST54.g b/runtime/JavaScript/tests/functional/t057autoAST54.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST54.g rename to runtime/JavaScript/tests/functional/t057autoAST54.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST6.g b/runtime/JavaScript/tests/functional/t057autoAST6.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST6.g rename to runtime/JavaScript/tests/functional/t057autoAST6.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST7.g b/runtime/JavaScript/tests/functional/t057autoAST7.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST7.g rename to runtime/JavaScript/tests/functional/t057autoAST7.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST8.g b/runtime/JavaScript/tests/functional/t057autoAST8.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST8.g rename to runtime/JavaScript/tests/functional/t057autoAST8.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST9.g b/runtime/JavaScript/tests/functional/t057autoAST9.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t057autoAST9.g rename to runtime/JavaScript/tests/functional/t057autoAST9.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST.html b/runtime/JavaScript/tests/functional/t058rewriteAST.html similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST.html rename to runtime/JavaScript/tests/functional/t058rewriteAST.html diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST1.g b/runtime/JavaScript/tests/functional/t058rewriteAST1.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST1.g rename to runtime/JavaScript/tests/functional/t058rewriteAST1.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST10.g b/runtime/JavaScript/tests/functional/t058rewriteAST10.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST10.g rename to runtime/JavaScript/tests/functional/t058rewriteAST10.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST11.g b/runtime/JavaScript/tests/functional/t058rewriteAST11.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST11.g rename to runtime/JavaScript/tests/functional/t058rewriteAST11.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST12.g b/runtime/JavaScript/tests/functional/t058rewriteAST12.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST12.g rename to runtime/JavaScript/tests/functional/t058rewriteAST12.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST13.g b/runtime/JavaScript/tests/functional/t058rewriteAST13.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST13.g rename to runtime/JavaScript/tests/functional/t058rewriteAST13.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST14.g b/runtime/JavaScript/tests/functional/t058rewriteAST14.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST14.g rename to runtime/JavaScript/tests/functional/t058rewriteAST14.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST15.g b/runtime/JavaScript/tests/functional/t058rewriteAST15.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST15.g rename to runtime/JavaScript/tests/functional/t058rewriteAST15.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST16.g b/runtime/JavaScript/tests/functional/t058rewriteAST16.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST16.g rename to runtime/JavaScript/tests/functional/t058rewriteAST16.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST17.g b/runtime/JavaScript/tests/functional/t058rewriteAST17.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST17.g rename to runtime/JavaScript/tests/functional/t058rewriteAST17.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST18.g b/runtime/JavaScript/tests/functional/t058rewriteAST18.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST18.g rename to runtime/JavaScript/tests/functional/t058rewriteAST18.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST19.g b/runtime/JavaScript/tests/functional/t058rewriteAST19.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST19.g rename to runtime/JavaScript/tests/functional/t058rewriteAST19.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST2.g b/runtime/JavaScript/tests/functional/t058rewriteAST2.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST2.g rename to runtime/JavaScript/tests/functional/t058rewriteAST2.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST20.g b/runtime/JavaScript/tests/functional/t058rewriteAST20.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST20.g rename to runtime/JavaScript/tests/functional/t058rewriteAST20.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST21.g b/runtime/JavaScript/tests/functional/t058rewriteAST21.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST21.g rename to runtime/JavaScript/tests/functional/t058rewriteAST21.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST22.g b/runtime/JavaScript/tests/functional/t058rewriteAST22.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST22.g rename to runtime/JavaScript/tests/functional/t058rewriteAST22.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST23.g b/runtime/JavaScript/tests/functional/t058rewriteAST23.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST23.g rename to runtime/JavaScript/tests/functional/t058rewriteAST23.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST24.g b/runtime/JavaScript/tests/functional/t058rewriteAST24.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST24.g rename to runtime/JavaScript/tests/functional/t058rewriteAST24.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST25.g b/runtime/JavaScript/tests/functional/t058rewriteAST25.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST25.g rename to runtime/JavaScript/tests/functional/t058rewriteAST25.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST26.g b/runtime/JavaScript/tests/functional/t058rewriteAST26.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST26.g rename to runtime/JavaScript/tests/functional/t058rewriteAST26.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST27.g b/runtime/JavaScript/tests/functional/t058rewriteAST27.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST27.g rename to runtime/JavaScript/tests/functional/t058rewriteAST27.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST28.g b/runtime/JavaScript/tests/functional/t058rewriteAST28.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST28.g rename to runtime/JavaScript/tests/functional/t058rewriteAST28.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST29.g b/runtime/JavaScript/tests/functional/t058rewriteAST29.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST29.g rename to runtime/JavaScript/tests/functional/t058rewriteAST29.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST3.g b/runtime/JavaScript/tests/functional/t058rewriteAST3.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST3.g rename to runtime/JavaScript/tests/functional/t058rewriteAST3.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST30.g b/runtime/JavaScript/tests/functional/t058rewriteAST30.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST30.g rename to runtime/JavaScript/tests/functional/t058rewriteAST30.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST31.g b/runtime/JavaScript/tests/functional/t058rewriteAST31.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST31.g rename to runtime/JavaScript/tests/functional/t058rewriteAST31.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST32.g b/runtime/JavaScript/tests/functional/t058rewriteAST32.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST32.g rename to runtime/JavaScript/tests/functional/t058rewriteAST32.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST33.g b/runtime/JavaScript/tests/functional/t058rewriteAST33.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST33.g rename to runtime/JavaScript/tests/functional/t058rewriteAST33.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST34.g b/runtime/JavaScript/tests/functional/t058rewriteAST34.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST34.g rename to runtime/JavaScript/tests/functional/t058rewriteAST34.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST35.g b/runtime/JavaScript/tests/functional/t058rewriteAST35.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST35.g rename to runtime/JavaScript/tests/functional/t058rewriteAST35.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST36.g b/runtime/JavaScript/tests/functional/t058rewriteAST36.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST36.g rename to runtime/JavaScript/tests/functional/t058rewriteAST36.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST37.g b/runtime/JavaScript/tests/functional/t058rewriteAST37.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST37.g rename to runtime/JavaScript/tests/functional/t058rewriteAST37.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST38.g b/runtime/JavaScript/tests/functional/t058rewriteAST38.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST38.g rename to runtime/JavaScript/tests/functional/t058rewriteAST38.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST39.g b/runtime/JavaScript/tests/functional/t058rewriteAST39.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST39.g rename to runtime/JavaScript/tests/functional/t058rewriteAST39.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST4.g b/runtime/JavaScript/tests/functional/t058rewriteAST4.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST4.g rename to runtime/JavaScript/tests/functional/t058rewriteAST4.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST40.g b/runtime/JavaScript/tests/functional/t058rewriteAST40.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST40.g rename to runtime/JavaScript/tests/functional/t058rewriteAST40.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST41.g b/runtime/JavaScript/tests/functional/t058rewriteAST41.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST41.g rename to runtime/JavaScript/tests/functional/t058rewriteAST41.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST42.g b/runtime/JavaScript/tests/functional/t058rewriteAST42.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST42.g rename to runtime/JavaScript/tests/functional/t058rewriteAST42.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST43.g b/runtime/JavaScript/tests/functional/t058rewriteAST43.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST43.g rename to runtime/JavaScript/tests/functional/t058rewriteAST43.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST44.g b/runtime/JavaScript/tests/functional/t058rewriteAST44.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST44.g rename to runtime/JavaScript/tests/functional/t058rewriteAST44.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST45.g b/runtime/JavaScript/tests/functional/t058rewriteAST45.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST45.g rename to runtime/JavaScript/tests/functional/t058rewriteAST45.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST46.g b/runtime/JavaScript/tests/functional/t058rewriteAST46.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST46.g rename to runtime/JavaScript/tests/functional/t058rewriteAST46.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST47.g b/runtime/JavaScript/tests/functional/t058rewriteAST47.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST47.g rename to runtime/JavaScript/tests/functional/t058rewriteAST47.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST48.g b/runtime/JavaScript/tests/functional/t058rewriteAST48.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST48.g rename to runtime/JavaScript/tests/functional/t058rewriteAST48.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST49.g b/runtime/JavaScript/tests/functional/t058rewriteAST49.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST49.g rename to runtime/JavaScript/tests/functional/t058rewriteAST49.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST5.g b/runtime/JavaScript/tests/functional/t058rewriteAST5.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST5.g rename to runtime/JavaScript/tests/functional/t058rewriteAST5.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST50.g b/runtime/JavaScript/tests/functional/t058rewriteAST50.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST50.g rename to runtime/JavaScript/tests/functional/t058rewriteAST50.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST51.g b/runtime/JavaScript/tests/functional/t058rewriteAST51.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST51.g rename to runtime/JavaScript/tests/functional/t058rewriteAST51.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST52.g b/runtime/JavaScript/tests/functional/t058rewriteAST52.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST52.g rename to runtime/JavaScript/tests/functional/t058rewriteAST52.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST53.g b/runtime/JavaScript/tests/functional/t058rewriteAST53.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST53.g rename to runtime/JavaScript/tests/functional/t058rewriteAST53.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST54.g b/runtime/JavaScript/tests/functional/t058rewriteAST54.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST54.g rename to runtime/JavaScript/tests/functional/t058rewriteAST54.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST55.g b/runtime/JavaScript/tests/functional/t058rewriteAST55.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST55.g rename to runtime/JavaScript/tests/functional/t058rewriteAST55.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST56.g b/runtime/JavaScript/tests/functional/t058rewriteAST56.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST56.g rename to runtime/JavaScript/tests/functional/t058rewriteAST56.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST57.g b/runtime/JavaScript/tests/functional/t058rewriteAST57.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST57.g rename to runtime/JavaScript/tests/functional/t058rewriteAST57.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST58.g b/runtime/JavaScript/tests/functional/t058rewriteAST58.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST58.g rename to runtime/JavaScript/tests/functional/t058rewriteAST58.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST59.g b/runtime/JavaScript/tests/functional/t058rewriteAST59.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST59.g rename to runtime/JavaScript/tests/functional/t058rewriteAST59.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST6.g b/runtime/JavaScript/tests/functional/t058rewriteAST6.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST6.g rename to runtime/JavaScript/tests/functional/t058rewriteAST6.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST60.g b/runtime/JavaScript/tests/functional/t058rewriteAST60.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST60.g rename to runtime/JavaScript/tests/functional/t058rewriteAST60.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST61.g b/runtime/JavaScript/tests/functional/t058rewriteAST61.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST61.g rename to runtime/JavaScript/tests/functional/t058rewriteAST61.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST62.g b/runtime/JavaScript/tests/functional/t058rewriteAST62.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST62.g rename to runtime/JavaScript/tests/functional/t058rewriteAST62.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST63.g b/runtime/JavaScript/tests/functional/t058rewriteAST63.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST63.g rename to runtime/JavaScript/tests/functional/t058rewriteAST63.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST64.g b/runtime/JavaScript/tests/functional/t058rewriteAST64.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST64.g rename to runtime/JavaScript/tests/functional/t058rewriteAST64.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST65.g b/runtime/JavaScript/tests/functional/t058rewriteAST65.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST65.g rename to runtime/JavaScript/tests/functional/t058rewriteAST65.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST66.g b/runtime/JavaScript/tests/functional/t058rewriteAST66.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST66.g rename to runtime/JavaScript/tests/functional/t058rewriteAST66.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST67.g b/runtime/JavaScript/tests/functional/t058rewriteAST67.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST67.g rename to runtime/JavaScript/tests/functional/t058rewriteAST67.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST68.g b/runtime/JavaScript/tests/functional/t058rewriteAST68.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST68.g rename to runtime/JavaScript/tests/functional/t058rewriteAST68.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST69.g b/runtime/JavaScript/tests/functional/t058rewriteAST69.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST69.g rename to runtime/JavaScript/tests/functional/t058rewriteAST69.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST7.g b/runtime/JavaScript/tests/functional/t058rewriteAST7.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST7.g rename to runtime/JavaScript/tests/functional/t058rewriteAST7.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST70.g b/runtime/JavaScript/tests/functional/t058rewriteAST70.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST70.g rename to runtime/JavaScript/tests/functional/t058rewriteAST70.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST71.g b/runtime/JavaScript/tests/functional/t058rewriteAST71.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST71.g rename to runtime/JavaScript/tests/functional/t058rewriteAST71.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST72.g b/runtime/JavaScript/tests/functional/t058rewriteAST72.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST72.g rename to runtime/JavaScript/tests/functional/t058rewriteAST72.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST73.g b/runtime/JavaScript/tests/functional/t058rewriteAST73.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST73.g rename to runtime/JavaScript/tests/functional/t058rewriteAST73.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST74.g b/runtime/JavaScript/tests/functional/t058rewriteAST74.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST74.g rename to runtime/JavaScript/tests/functional/t058rewriteAST74.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST75.g b/runtime/JavaScript/tests/functional/t058rewriteAST75.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST75.g rename to runtime/JavaScript/tests/functional/t058rewriteAST75.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST76.g b/runtime/JavaScript/tests/functional/t058rewriteAST76.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST76.g rename to runtime/JavaScript/tests/functional/t058rewriteAST76.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST77.g b/runtime/JavaScript/tests/functional/t058rewriteAST77.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST77.g rename to runtime/JavaScript/tests/functional/t058rewriteAST77.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST78.g b/runtime/JavaScript/tests/functional/t058rewriteAST78.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST78.g rename to runtime/JavaScript/tests/functional/t058rewriteAST78.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST79.g b/runtime/JavaScript/tests/functional/t058rewriteAST79.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST79.g rename to runtime/JavaScript/tests/functional/t058rewriteAST79.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST8.g b/runtime/JavaScript/tests/functional/t058rewriteAST8.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST8.g rename to runtime/JavaScript/tests/functional/t058rewriteAST8.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST80.g b/runtime/JavaScript/tests/functional/t058rewriteAST80.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST80.g rename to runtime/JavaScript/tests/functional/t058rewriteAST80.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST81.g b/runtime/JavaScript/tests/functional/t058rewriteAST81.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST81.g rename to runtime/JavaScript/tests/functional/t058rewriteAST81.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST82.g b/runtime/JavaScript/tests/functional/t058rewriteAST82.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST82.g rename to runtime/JavaScript/tests/functional/t058rewriteAST82.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST83.g b/runtime/JavaScript/tests/functional/t058rewriteAST83.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST83.g rename to runtime/JavaScript/tests/functional/t058rewriteAST83.g diff --git a/antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST9.g b/runtime/JavaScript/tests/functional/t058rewriteAST9.g similarity index 100% rename from antlr-3.4/runtime/JavaScript/tests/functional/t058rewriteAST9.g rename to runtime/JavaScript/tests/functional/t058rewriteAST9.g diff --git a/antlr-3.4/runtime/JavaScript/third/antcontrib.properties b/runtime/JavaScript/third/antcontrib.properties similarity index 100% rename from antlr-3.4/runtime/JavaScript/third/antcontrib.properties rename to runtime/JavaScript/third/antcontrib.properties diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework.zip b/runtime/ObjC/ANTLR.framework.zip similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework.zip rename to runtime/ObjC/ANTLR.framework.zip diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/ANTLR b/runtime/ObjC/ANTLR.framework/ANTLR similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/ANTLR rename to runtime/ObjC/ANTLR.framework/ANTLR diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLR.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLR.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLR.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLR.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseMapElement.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseMapElement.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseRecognizer.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseRecognizer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseRecognizer.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseRecognizer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseStack.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseStack.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTree.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTree.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBaseTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBitSet.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBitSet.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBitSet.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBitSet.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTokenStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTokenStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRBufferedTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStreamState.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStreamState.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCharStreamState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonErrorNode.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonErrorNode.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonErrorNode.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonErrorNode.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonToken.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonToken.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonToken.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTokenStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTokenStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTree.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTree.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRCommonTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDFA.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDFA.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDFA.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDFA.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebug.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebug.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebug.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebug.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventListener.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventListener.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventListener.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventListener.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventProxy.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventProxy.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventProxy.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugEventProxy.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugParser.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugParser.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTokenStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTokenStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeParser.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeParser.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRDebugTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLREarlyExitException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLREarlyExitException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLREarlyExitException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLREarlyExitException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRError.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRError.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRError.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRError.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRFailedPredicateException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRFailedPredicateException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRFailedPredicateException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRFailedPredicateException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRFastQueue.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRFastQueue.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRFastQueue.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRFastQueue.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.m b/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.m rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRHashMap.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.m b/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.m rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRHashRule.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRIntArray.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRIntArray.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRIntArray.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRIntArray.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRIntStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRIntStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRIntStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRIntStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLexer.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLexer.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRLexer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLexerRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRLexerRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLexerRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRLexerRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLinkBase.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRLinkBase.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLinkBase.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRLinkBase.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLookaheadStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRLookaheadStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRLookaheadStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRLookaheadStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMap.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMap.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMapElement.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMapElement.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedNotSetException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedNotSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedNotSetException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedNotSetException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedRangeException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedRangeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedRangeException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedRangeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedSetException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedSetException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedSetException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTokenException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTokenException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTreeNodeException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTreeNodeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTreeNodeException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMismatchedTreeNodeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMissingTokenException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRMissingTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRMissingTokenException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRMissingTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRNoViableAltException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRNoViableAltException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRNoViableAltException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRNoViableAltException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRNodeMapElement.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRNodeMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRNodeMapElement.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRNodeMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRParseTree.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRParseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRParseTree.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRParseTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRParser.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRParser.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRParserRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRParserRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRParserRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRParserRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRPtrBuffer.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRPtrBuffer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRPtrBuffer.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRPtrBuffer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognitionException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognitionException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognitionException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognitionException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognizerSharedState.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognizerSharedState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognizerSharedState.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRecognizerSharedState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleElementStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleElementStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleElementStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleElementStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleSubtreeStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleSubtreeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleSubtreeStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleSubtreeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleTokenStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleTokenStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRewriteRuleTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMapElement.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMapElement.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMemo.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMemo.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMemo.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleMemo.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.m b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.m rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRuleStack.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuntimeException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuntimeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRRuntimeException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRRuntimeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRStreamEnumerator.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRStreamEnumerator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRStreamEnumerator.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRStreamEnumerator.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRStringStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRStringStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRStringStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRStringStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.m b/runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.m rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRSymbolStack.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRToken+DebuggerSupport.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRToken+DebuggerSupport.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRToken+DebuggerSupport.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRToken+DebuggerSupport.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRToken.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRToken.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRToken.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenRewriteStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenRewriteStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenRewriteStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenRewriteStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenSource.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenSource.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenSource.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenSource.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTree.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTree.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeIterator.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeIterator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeIterator.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeIterator.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeParser.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeParser.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternLexer.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternLexer.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternLexer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternParser.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternParser.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreePatternParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRewriter.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRewriter.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRewriter.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRewriter.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitor.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitor.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitorAction.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitorAction.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitorAction.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeVisitorAction.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeWizard.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeWizard.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeWizard.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRTreeWizard.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedTokenStream.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedTokenStream.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRUnbufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUniqueIDMap.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRUniqueIDMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUniqueIDMap.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRUniqueIDMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnwantedTokenException.h b/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnwantedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Headers/ANTLRUnwantedTokenException.h rename to runtime/ObjC/ANTLR.framework/Headers/ANTLRUnwantedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Resources/English.lproj/InfoPlist.strings b/runtime/ObjC/ANTLR.framework/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Resources/English.lproj/InfoPlist.strings rename to runtime/ObjC/ANTLR.framework/Resources/English.lproj/InfoPlist.strings diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Resources/Info.plist b/runtime/ObjC/ANTLR.framework/Resources/Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Resources/Info.plist rename to runtime/ObjC/ANTLR.framework/Resources/Info.plist diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/ANTLR b/runtime/ObjC/ANTLR.framework/Versions/A/ANTLR similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/ANTLR rename to runtime/ObjC/ANTLR.framework/Versions/A/ANTLR diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLR.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLR.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLR.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLR.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseRecognizer.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseRecognizer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseRecognizer.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseRecognizer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseStack.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseStack.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTree.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTree.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBaseTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBitSet.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBitSet.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBitSet.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBitSet.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRBufferedTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStreamState.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStreamState.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCharStreamState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonErrorNode.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonErrorNode.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonErrorNode.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonErrorNode.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonToken.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonToken.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonToken.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTree.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTree.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRCommonTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDFA.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDFA.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDFA.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDFA.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebug.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebug.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebug.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebug.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventListener.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventListener.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventListener.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventListener.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventProxy.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventProxy.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventProxy.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugEventProxy.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugParser.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugParser.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeParser.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeParser.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRDebugTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLREarlyExitException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLREarlyExitException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLREarlyExitException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLREarlyExitException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRError.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRError.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRError.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRError.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFailedPredicateException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFailedPredicateException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFailedPredicateException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFailedPredicateException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFastQueue.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFastQueue.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFastQueue.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRFastQueue.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.m b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.m rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashMap.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.m b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.m rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRHashRule.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntArray.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntArray.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntArray.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntArray.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRIntStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexer.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexer.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexerRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexerRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexerRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLexerRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLinkBase.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLinkBase.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLinkBase.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLinkBase.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLookaheadStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLookaheadStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLookaheadStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRLookaheadStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMap.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMap.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedNotSetException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedNotSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedNotSetException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedNotSetException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedRangeException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedRangeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedRangeException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedRangeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedSetException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedSetException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedSetException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTokenException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTokenException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTreeNodeException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTreeNodeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTreeNodeException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMismatchedTreeNodeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMissingTokenException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMissingTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMissingTokenException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRMissingTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNoViableAltException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNoViableAltException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNoViableAltException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNoViableAltException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNodeMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNodeMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNodeMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRNodeMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParseTree.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParseTree.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParseTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParser.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParser.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParserRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParserRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParserRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRParserRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRPtrBuffer.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRPtrBuffer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRPtrBuffer.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRPtrBuffer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognitionException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognitionException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognitionException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognitionException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognizerSharedState.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognizerSharedState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognizerSharedState.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRecognizerSharedState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleElementStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleElementStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleElementStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleElementStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleSubtreeStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleSubtreeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleSubtreeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleSubtreeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRewriteRuleTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMemo.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMemo.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMemo.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleMemo.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.m b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.m rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuleStack.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuntimeException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuntimeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuntimeException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRRuntimeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStreamEnumerator.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStreamEnumerator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStreamEnumerator.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStreamEnumerator.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStringStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStringStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStringStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRStringStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.m b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.m rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRSymbolStack.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken+DebuggerSupport.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken+DebuggerSupport.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken+DebuggerSupport.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken+DebuggerSupport.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRToken.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenRewriteStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenRewriteStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenRewriteStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenRewriteStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenSource.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenSource.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenSource.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenSource.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTree.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTree.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeIterator.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeIterator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeIterator.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeIterator.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeParser.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeParser.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternLexer.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternLexer.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternLexer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternParser.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternParser.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreePatternParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRewriter.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRewriter.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRewriter.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRewriter.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitor.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitor.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitorAction.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitorAction.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitorAction.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeVisitorAction.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeWizard.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeWizard.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeWizard.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRTreeWizard.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnbufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUniqueIDMap.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUniqueIDMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUniqueIDMap.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUniqueIDMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnwantedTokenException.h b/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnwantedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnwantedTokenException.h rename to runtime/ObjC/ANTLR.framework/Versions/A/Headers/ANTLRUnwantedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/runtime/ObjC/ANTLR.framework/Versions/A/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Resources/English.lproj/InfoPlist.strings rename to runtime/ObjC/ANTLR.framework/Versions/A/Resources/English.lproj/InfoPlist.strings diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Resources/Info.plist b/runtime/ObjC/ANTLR.framework/Versions/A/Resources/Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/A/Resources/Info.plist rename to runtime/ObjC/ANTLR.framework/Versions/A/Resources/Info.plist diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/ANTLR b/runtime/ObjC/ANTLR.framework/Versions/Current/ANTLR similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/ANTLR rename to runtime/ObjC/ANTLR.framework/Versions/Current/ANTLR diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLR.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLR.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLR.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLR.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseRecognizer.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseRecognizer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseRecognizer.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseRecognizer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseStack.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseStack.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTree.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTree.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBaseTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBitSet.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBitSet.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBitSet.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBitSet.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRBufferedTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStreamState.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStreamState.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCharStreamState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonErrorNode.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonErrorNode.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonErrorNode.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonErrorNode.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonToken.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonToken.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonToken.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTree.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTree.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRCommonTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDFA.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDFA.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDFA.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDFA.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebug.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebug.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebug.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebug.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventListener.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventListener.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventListener.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventListener.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventProxy.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventProxy.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventProxy.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugEventProxy.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugParser.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugParser.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeParser.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeParser.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRDebugTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLREarlyExitException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLREarlyExitException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLREarlyExitException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLREarlyExitException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRError.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRError.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRError.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRError.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFailedPredicateException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFailedPredicateException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFailedPredicateException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFailedPredicateException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFastQueue.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFastQueue.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFastQueue.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRFastQueue.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.m b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.m rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashMap.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.m b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.m rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRHashRule.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntArray.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntArray.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntArray.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntArray.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRIntStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexer.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexer.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexerRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexerRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexerRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLexerRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLinkBase.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLinkBase.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLinkBase.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLinkBase.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLookaheadStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLookaheadStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLookaheadStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRLookaheadStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMap.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMap.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedNotSetException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedNotSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedNotSetException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedNotSetException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedRangeException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedRangeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedRangeException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedRangeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedSetException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedSetException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedSetException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTokenException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTokenException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTreeNodeException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTreeNodeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTreeNodeException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMismatchedTreeNodeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMissingTokenException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMissingTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMissingTokenException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRMissingTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNoViableAltException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNoViableAltException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNoViableAltException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNoViableAltException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNodeMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNodeMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNodeMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRNodeMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParseTree.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParseTree.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParseTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParser.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParser.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParserRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParserRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParserRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRParserRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRPtrBuffer.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRPtrBuffer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRPtrBuffer.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRPtrBuffer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognitionException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognitionException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognitionException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognitionException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognizerSharedState.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognizerSharedState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognizerSharedState.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRecognizerSharedState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleElementStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleElementStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleElementStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleElementStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleSubtreeStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleSubtreeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleSubtreeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleSubtreeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRewriteRuleTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMapElement.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMapElement.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMapElement.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMemo.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMemo.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMemo.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleMemo.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.m b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.m rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuleStack.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuntimeException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuntimeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuntimeException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRRuntimeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStreamEnumerator.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStreamEnumerator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStreamEnumerator.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStreamEnumerator.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStringStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStringStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStringStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRStringStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.m b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.m rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRSymbolStack.m diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken+DebuggerSupport.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken+DebuggerSupport.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken+DebuggerSupport.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken+DebuggerSupport.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRToken.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenRewriteStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenRewriteStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenRewriteStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenRewriteStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenSource.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenSource.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenSource.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenSource.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTree.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTree.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTree.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeAdaptor.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeAdaptor.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeIterator.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeIterator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeIterator.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeIterator.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeNodeStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeNodeStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeParser.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeParser.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternLexer.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternLexer.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternLexer.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternParser.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternParser.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreePatternParser.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRewriter.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRewriter.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRewriter.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRewriter.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRuleReturnScope.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRuleReturnScope.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitor.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitor.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitor.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitorAction.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitorAction.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitorAction.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeVisitorAction.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeWizard.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeWizard.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeWizard.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRTreeWizard.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedCommonTreeNodeStreamState.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedTokenStream.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedTokenStream.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnbufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUniqueIDMap.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUniqueIDMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUniqueIDMap.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUniqueIDMap.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnwantedTokenException.h b/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnwantedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnwantedTokenException.h rename to runtime/ObjC/ANTLR.framework/Versions/Current/Headers/ANTLRUnwantedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings b/runtime/ObjC/ANTLR.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings rename to runtime/ObjC/ANTLR.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings diff --git a/antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Resources/Info.plist b/runtime/ObjC/ANTLR.framework/Versions/Current/Resources/Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/ANTLR.framework/Versions/Current/Resources/Info.plist rename to runtime/ObjC/ANTLR.framework/Versions/Current/Resources/Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ACBTree.h b/runtime/ObjC/Framework/ACBTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ACBTree.h rename to runtime/ObjC/Framework/ACBTree.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ACBTree.m b/runtime/ObjC/Framework/ACBTree.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ACBTree.m rename to runtime/ObjC/Framework/ACBTree.m diff --git a/antlr-3.4/runtime/ObjC/Framework/AMutableArray.h b/runtime/ObjC/Framework/AMutableArray.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/AMutableArray.h rename to runtime/ObjC/Framework/AMutableArray.h diff --git a/antlr-3.4/runtime/ObjC/Framework/AMutableArray.m b/runtime/ObjC/Framework/AMutableArray.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/AMutableArray.m rename to runtime/ObjC/Framework/AMutableArray.m diff --git a/antlr-3.4/runtime/ObjC/Framework/AMutableDictionary.h b/runtime/ObjC/Framework/AMutableDictionary.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/AMutableDictionary.h rename to runtime/ObjC/Framework/AMutableDictionary.h diff --git a/antlr-3.4/runtime/ObjC/Framework/AMutableDictionary.m b/runtime/ObjC/Framework/AMutableDictionary.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/AMutableDictionary.m rename to runtime/ObjC/Framework/AMutableDictionary.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR.h b/runtime/ObjC/Framework/ANTLR.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR.h rename to runtime/ObjC/Framework/ANTLR.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.mode1v3 b/runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.mode1v3 similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.mode1v3 rename to runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.mode1v3 diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.pbxuser b/runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.pbxuser similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.pbxuser rename to runtime/ObjC/Framework/ANTLR.xcodeproj/acondit.pbxuser diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR.xcodeproj/project.pbxproj b/runtime/ObjC/Framework/ANTLR.xcodeproj/project.pbxproj similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR.xcodeproj/project.pbxproj rename to runtime/ObjC/Framework/ANTLR.xcodeproj/project.pbxproj diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/.DS_Store b/runtime/ObjC/Framework/ANTLR/.DS_Store similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/.DS_Store rename to runtime/ObjC/Framework/ANTLR/.DS_Store diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.pbxproj b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.pbxproj similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.pbxproj rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.pbxproj diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/UserInterfaceState.xcuserstate b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/UserInterfaceState.xcuserstate rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/WorkspaceSettings.xcsettings b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/WorkspaceSettings.xcsettings similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/WorkspaceSettings.xcsettings rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/xcdebugger/Expressions.xcexplist b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/xcdebugger/Expressions.xcexplist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/xcdebugger/Expressions.xcexplist rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/project.xcworkspace/xcuserdata/acondit.xcuserdatad/xcdebugger/Expressions.xcexplist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLR.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLR.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLR.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLR.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLRTests.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLRTests.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLRTests.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/ANTLRTests.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/Fuzzy.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/Fuzzy.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/Fuzzy.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/Fuzzy.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/LL-start.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/LL-start.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/LL-start.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/LL-start.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/combined.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/combined.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/combined.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/combined.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/hoistedPredicates.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/hoistedPredicates.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/hoistedPredicates.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/hoistedPredicates.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/lexertest-simple.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/lexertest-simple.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/lexertest-simple.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/lexertest-simple.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/polydiff.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/polydiff.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/polydiff.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/polydiff.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/scopes.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/scopes.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/scopes.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/scopes.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/simplecTreeParser.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/simplecTreeParser.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/simplecTreeParser.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/simplecTreeParser.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treeparser.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treeparser.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treeparser.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treeparser.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treerewrite.xcscheme b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treerewrite.xcscheme similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treerewrite.xcscheme rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/treerewrite.xcscheme diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/xcschememanagement.plist b/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/xcschememanagement.plist rename to runtime/ObjC/Framework/ANTLR/ANTLR.xcodeproj/xcuserdata/acondit.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Info.plist b/runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Info.plist rename to runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Prefix.pch b/runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Prefix.pch similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Prefix.pch rename to runtime/ObjC/Framework/ANTLR/ANTLR/ANTLR-Prefix.pch diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR/en.lproj/InfoPlist.strings b/runtime/ObjC/Framework/ANTLR/ANTLR/en.lproj/InfoPlist.strings similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLR/en.lproj/InfoPlist.strings rename to runtime/ObjC/Framework/ANTLR/ANTLR/en.lproj/InfoPlist.strings diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Info.plist b/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Info.plist rename to runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Prefix.pch b/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Prefix.pch similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Prefix.pch rename to runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests-Prefix.pch diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.h b/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.h rename to runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.m b/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.m rename to runtime/ObjC/Framework/ANTLR/ANTLRTests/ANTLRTests.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/en.lproj/InfoPlist.strings b/runtime/ObjC/Framework/ANTLR/ANTLRTests/en.lproj/InfoPlist.strings similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR/ANTLRTests/en.lproj/InfoPlist.strings rename to runtime/ObjC/Framework/ANTLR/ANTLRTests/en.lproj/InfoPlist.strings diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseMapElement.h b/runtime/ObjC/Framework/ANTLRBaseMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseMapElement.h rename to runtime/ObjC/Framework/ANTLRBaseMapElement.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseMapElement.m b/runtime/ObjC/Framework/ANTLRBaseMapElement.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseMapElement.m rename to runtime/ObjC/Framework/ANTLRBaseMapElement.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseRecognizer.h b/runtime/ObjC/Framework/ANTLRBaseRecognizer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseRecognizer.h rename to runtime/ObjC/Framework/ANTLRBaseRecognizer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseRecognizer.m b/runtime/ObjC/Framework/ANTLRBaseRecognizer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseRecognizer.m rename to runtime/ObjC/Framework/ANTLRBaseRecognizer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseStack.h b/runtime/ObjC/Framework/ANTLRBaseStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseStack.h rename to runtime/ObjC/Framework/ANTLRBaseStack.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseStack.m b/runtime/ObjC/Framework/ANTLRBaseStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseStack.m rename to runtime/ObjC/Framework/ANTLRBaseStack.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTree.h b/runtime/ObjC/Framework/ANTLRBaseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTree.h rename to runtime/ObjC/Framework/ANTLRBaseTree.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTree.m b/runtime/ObjC/Framework/ANTLRBaseTree.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTree.m rename to runtime/ObjC/Framework/ANTLRBaseTree.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.h b/runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.h rename to runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.m b/runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.m rename to runtime/ObjC/Framework/ANTLRBaseTreeAdaptor.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBitSet.h b/runtime/ObjC/Framework/ANTLRBitSet.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBitSet.h rename to runtime/ObjC/Framework/ANTLRBitSet.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBitSet.m b/runtime/ObjC/Framework/ANTLRBitSet.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBitSet.m rename to runtime/ObjC/Framework/ANTLRBitSet.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBitsetTest-Info.plist b/runtime/ObjC/Framework/ANTLRBitsetTest-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBitsetTest-Info.plist rename to runtime/ObjC/Framework/ANTLRBitsetTest-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTokenStream.h b/runtime/ObjC/Framework/ANTLRBufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTokenStream.h rename to runtime/ObjC/Framework/ANTLRBufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTokenStream.m b/runtime/ObjC/Framework/ANTLRBufferedTokenStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTokenStream.m rename to runtime/ObjC/Framework/ANTLRBufferedTokenStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.h b/runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.h rename to runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.m b/runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.m rename to runtime/ObjC/Framework/ANTLRBufferedTreeNodeStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCharStream.h b/runtime/ObjC/Framework/ANTLRCharStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCharStream.h rename to runtime/ObjC/Framework/ANTLRCharStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCharStreamState.h b/runtime/ObjC/Framework/ANTLRCharStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCharStreamState.h rename to runtime/ObjC/Framework/ANTLRCharStreamState.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCharStreamState.m b/runtime/ObjC/Framework/ANTLRCharStreamState.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCharStreamState.m rename to runtime/ObjC/Framework/ANTLRCharStreamState.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonErrorNode.h b/runtime/ObjC/Framework/ANTLRCommonErrorNode.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonErrorNode.h rename to runtime/ObjC/Framework/ANTLRCommonErrorNode.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonErrorNode.m b/runtime/ObjC/Framework/ANTLRCommonErrorNode.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonErrorNode.m rename to runtime/ObjC/Framework/ANTLRCommonErrorNode.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonToken.h b/runtime/ObjC/Framework/ANTLRCommonToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonToken.h rename to runtime/ObjC/Framework/ANTLRCommonToken.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonToken.m b/runtime/ObjC/Framework/ANTLRCommonToken.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonToken.m rename to runtime/ObjC/Framework/ANTLRCommonToken.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTokenStream.h b/runtime/ObjC/Framework/ANTLRCommonTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTokenStream.h rename to runtime/ObjC/Framework/ANTLRCommonTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTokenStream.m b/runtime/ObjC/Framework/ANTLRCommonTokenStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTokenStream.m rename to runtime/ObjC/Framework/ANTLRCommonTokenStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTokenTest-Info.plist b/runtime/ObjC/Framework/ANTLRCommonTokenTest-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTokenTest-Info.plist rename to runtime/ObjC/Framework/ANTLRCommonTokenTest-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTree.h b/runtime/ObjC/Framework/ANTLRCommonTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTree.h rename to runtime/ObjC/Framework/ANTLRCommonTree.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTree.m b/runtime/ObjC/Framework/ANTLRCommonTree.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTree.m rename to runtime/ObjC/Framework/ANTLRCommonTree.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.h b/runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.h rename to runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.m b/runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.m rename to runtime/ObjC/Framework/ANTLRCommonTreeAdaptor.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.h b/runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.h rename to runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.m b/runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.m rename to runtime/ObjC/Framework/ANTLRCommonTreeNodeStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeTest-Info.plist b/runtime/ObjC/Framework/ANTLRCommonTreeTest-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRCommonTreeTest-Info.plist rename to runtime/ObjC/Framework/ANTLRCommonTreeTest-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDFA.h b/runtime/ObjC/Framework/ANTLRDFA.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDFA.h rename to runtime/ObjC/Framework/ANTLRDFA.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDFA.m b/runtime/ObjC/Framework/ANTLRDFA.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDFA.m rename to runtime/ObjC/Framework/ANTLRDFA.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebug.h b/runtime/ObjC/Framework/ANTLRDebug.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebug.h rename to runtime/ObjC/Framework/ANTLRDebug.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugEventListener.h b/runtime/ObjC/Framework/ANTLRDebugEventListener.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugEventListener.h rename to runtime/ObjC/Framework/ANTLRDebugEventListener.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugEventProxy.h b/runtime/ObjC/Framework/ANTLRDebugEventProxy.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugEventProxy.h rename to runtime/ObjC/Framework/ANTLRDebugEventProxy.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugEventProxy.m b/runtime/ObjC/Framework/ANTLRDebugEventProxy.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugEventProxy.m rename to runtime/ObjC/Framework/ANTLRDebugEventProxy.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugParser.h b/runtime/ObjC/Framework/ANTLRDebugParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugParser.h rename to runtime/ObjC/Framework/ANTLRDebugParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugParser.m b/runtime/ObjC/Framework/ANTLRDebugParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugParser.m rename to runtime/ObjC/Framework/ANTLRDebugParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTokenStream.h b/runtime/ObjC/Framework/ANTLRDebugTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTokenStream.h rename to runtime/ObjC/Framework/ANTLRDebugTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTokenStream.m b/runtime/ObjC/Framework/ANTLRDebugTokenStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTokenStream.m rename to runtime/ObjC/Framework/ANTLRDebugTokenStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.h b/runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.h rename to runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.m b/runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.m rename to runtime/ObjC/Framework/ANTLRDebugTreeAdaptor.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.h b/runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.h rename to runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.m b/runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.m rename to runtime/ObjC/Framework/ANTLRDebugTreeNodeStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeParser.h b/runtime/ObjC/Framework/ANTLRDebugTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeParser.h rename to runtime/ObjC/Framework/ANTLRDebugTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeParser.m b/runtime/ObjC/Framework/ANTLRDebugTreeParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDebugTreeParser.m rename to runtime/ObjC/Framework/ANTLRDebugTreeParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDoubleKeyMap.h b/runtime/ObjC/Framework/ANTLRDoubleKeyMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDoubleKeyMap.h rename to runtime/ObjC/Framework/ANTLRDoubleKeyMap.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRDoubleKeyMap.m b/runtime/ObjC/Framework/ANTLRDoubleKeyMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRDoubleKeyMap.m rename to runtime/ObjC/Framework/ANTLRDoubleKeyMap.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLREarlyExitException.h b/runtime/ObjC/Framework/ANTLREarlyExitException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLREarlyExitException.h rename to runtime/ObjC/Framework/ANTLREarlyExitException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLREarlyExitException.m b/runtime/ObjC/Framework/ANTLREarlyExitException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLREarlyExitException.m rename to runtime/ObjC/Framework/ANTLREarlyExitException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRError.h b/runtime/ObjC/Framework/ANTLRError.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRError.h rename to runtime/ObjC/Framework/ANTLRError.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFailedPredicateException.h b/runtime/ObjC/Framework/ANTLRFailedPredicateException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFailedPredicateException.h rename to runtime/ObjC/Framework/ANTLRFailedPredicateException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFailedPredicateException.m b/runtime/ObjC/Framework/ANTLRFailedPredicateException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFailedPredicateException.m rename to runtime/ObjC/Framework/ANTLRFailedPredicateException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFastQueue.h b/runtime/ObjC/Framework/ANTLRFastQueue.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFastQueue.h rename to runtime/ObjC/Framework/ANTLRFastQueue.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFastQueue.m b/runtime/ObjC/Framework/ANTLRFastQueue.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFastQueue.m rename to runtime/ObjC/Framework/ANTLRFastQueue.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFastQueueTest-Info.plist b/runtime/ObjC/Framework/ANTLRFastQueueTest-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFastQueueTest-Info.plist rename to runtime/ObjC/Framework/ANTLRFastQueueTest-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFileStream.h b/runtime/ObjC/Framework/ANTLRFileStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFileStream.h rename to runtime/ObjC/Framework/ANTLRFileStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRFileStream.m b/runtime/ObjC/Framework/ANTLRFileStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRFileStream.m rename to runtime/ObjC/Framework/ANTLRFileStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRHashMap.h b/runtime/ObjC/Framework/ANTLRHashMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRHashMap.h rename to runtime/ObjC/Framework/ANTLRHashMap.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRHashMap.m b/runtime/ObjC/Framework/ANTLRHashMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRHashMap.m rename to runtime/ObjC/Framework/ANTLRHashMap.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRHashRule.h b/runtime/ObjC/Framework/ANTLRHashRule.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRHashRule.h rename to runtime/ObjC/Framework/ANTLRHashRule.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRHashRule.m b/runtime/ObjC/Framework/ANTLRHashRule.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRHashRule.m rename to runtime/ObjC/Framework/ANTLRHashRule.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRInputStream.h b/runtime/ObjC/Framework/ANTLRInputStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRInputStream.h rename to runtime/ObjC/Framework/ANTLRInputStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRInputStream.m b/runtime/ObjC/Framework/ANTLRInputStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRInputStream.m rename to runtime/ObjC/Framework/ANTLRInputStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRIntArray.h b/runtime/ObjC/Framework/ANTLRIntArray.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRIntArray.h rename to runtime/ObjC/Framework/ANTLRIntArray.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRIntArray.m b/runtime/ObjC/Framework/ANTLRIntArray.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRIntArray.m rename to runtime/ObjC/Framework/ANTLRIntArray.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRIntArrayTest-Info.plist b/runtime/ObjC/Framework/ANTLRIntArrayTest-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRIntArrayTest-Info.plist rename to runtime/ObjC/Framework/ANTLRIntArrayTest-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRIntStream.h b/runtime/ObjC/Framework/ANTLRIntStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRIntStream.h rename to runtime/ObjC/Framework/ANTLRIntStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLexer.h b/runtime/ObjC/Framework/ANTLRLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLexer.h rename to runtime/ObjC/Framework/ANTLRLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLexer.m b/runtime/ObjC/Framework/ANTLRLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLexer.m rename to runtime/ObjC/Framework/ANTLRLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.h b/runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.h rename to runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.m b/runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.m rename to runtime/ObjC/Framework/ANTLRLexerRuleReturnScope.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLexerState.h b/runtime/ObjC/Framework/ANTLRLexerState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLexerState.h rename to runtime/ObjC/Framework/ANTLRLexerState.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLexerState.m b/runtime/ObjC/Framework/ANTLRLexerState.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLexerState.m rename to runtime/ObjC/Framework/ANTLRLexerState.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLinkBase.h b/runtime/ObjC/Framework/ANTLRLinkBase.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLinkBase.h rename to runtime/ObjC/Framework/ANTLRLinkBase.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLinkBase.m b/runtime/ObjC/Framework/ANTLRLinkBase.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLinkBase.m rename to runtime/ObjC/Framework/ANTLRLinkBase.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLookaheadStream.h b/runtime/ObjC/Framework/ANTLRLookaheadStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLookaheadStream.h rename to runtime/ObjC/Framework/ANTLRLookaheadStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRLookaheadStream.m b/runtime/ObjC/Framework/ANTLRLookaheadStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRLookaheadStream.m rename to runtime/ObjC/Framework/ANTLRLookaheadStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMap.h b/runtime/ObjC/Framework/ANTLRMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMap.h rename to runtime/ObjC/Framework/ANTLRMap.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMap.m b/runtime/ObjC/Framework/ANTLRMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMap.m rename to runtime/ObjC/Framework/ANTLRMap.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMapElement.h b/runtime/ObjC/Framework/ANTLRMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMapElement.h rename to runtime/ObjC/Framework/ANTLRMapElement.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMapElement.m b/runtime/ObjC/Framework/ANTLRMapElement.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMapElement.m rename to runtime/ObjC/Framework/ANTLRMapElement.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedNotSetException.h b/runtime/ObjC/Framework/ANTLRMismatchedNotSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedNotSetException.h rename to runtime/ObjC/Framework/ANTLRMismatchedNotSetException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedNotSetException.m b/runtime/ObjC/Framework/ANTLRMismatchedNotSetException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedNotSetException.m rename to runtime/ObjC/Framework/ANTLRMismatchedNotSetException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedRangeException.h b/runtime/ObjC/Framework/ANTLRMismatchedRangeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedRangeException.h rename to runtime/ObjC/Framework/ANTLRMismatchedRangeException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedRangeException.m b/runtime/ObjC/Framework/ANTLRMismatchedRangeException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedRangeException.m rename to runtime/ObjC/Framework/ANTLRMismatchedRangeException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedSetException.h b/runtime/ObjC/Framework/ANTLRMismatchedSetException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedSetException.h rename to runtime/ObjC/Framework/ANTLRMismatchedSetException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedSetException.m b/runtime/ObjC/Framework/ANTLRMismatchedSetException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedSetException.m rename to runtime/ObjC/Framework/ANTLRMismatchedSetException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTokenException.h b/runtime/ObjC/Framework/ANTLRMismatchedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTokenException.h rename to runtime/ObjC/Framework/ANTLRMismatchedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTokenException.m b/runtime/ObjC/Framework/ANTLRMismatchedTokenException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTokenException.m rename to runtime/ObjC/Framework/ANTLRMismatchedTokenException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.h b/runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.h rename to runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.m b/runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.m rename to runtime/ObjC/Framework/ANTLRMismatchedTreeNodeException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMissingTokenException.h b/runtime/ObjC/Framework/ANTLRMissingTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMissingTokenException.h rename to runtime/ObjC/Framework/ANTLRMissingTokenException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRMissingTokenException.m b/runtime/ObjC/Framework/ANTLRMissingTokenException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRMissingTokenException.m rename to runtime/ObjC/Framework/ANTLRMissingTokenException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRNoViableAltException.h b/runtime/ObjC/Framework/ANTLRNoViableAltException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRNoViableAltException.h rename to runtime/ObjC/Framework/ANTLRNoViableAltException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRNoViableAltException.m b/runtime/ObjC/Framework/ANTLRNoViableAltException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRNoViableAltException.m rename to runtime/ObjC/Framework/ANTLRNoViableAltException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRNodeMapElement.h b/runtime/ObjC/Framework/ANTLRNodeMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRNodeMapElement.h rename to runtime/ObjC/Framework/ANTLRNodeMapElement.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRNodeMapElement.m b/runtime/ObjC/Framework/ANTLRNodeMapElement.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRNodeMapElement.m rename to runtime/ObjC/Framework/ANTLRNodeMapElement.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRParseTree.h b/runtime/ObjC/Framework/ANTLRParseTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRParseTree.h rename to runtime/ObjC/Framework/ANTLRParseTree.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRParseTree.m b/runtime/ObjC/Framework/ANTLRParseTree.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRParseTree.m rename to runtime/ObjC/Framework/ANTLRParseTree.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRParser.h b/runtime/ObjC/Framework/ANTLRParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRParser.h rename to runtime/ObjC/Framework/ANTLRParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRParser.m b/runtime/ObjC/Framework/ANTLRParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRParser.m rename to runtime/ObjC/Framework/ANTLRParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRParserRuleReturnScope.h b/runtime/ObjC/Framework/ANTLRParserRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRParserRuleReturnScope.h rename to runtime/ObjC/Framework/ANTLRParserRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRParserRuleReturnScope.m b/runtime/ObjC/Framework/ANTLRParserRuleReturnScope.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRParserRuleReturnScope.m rename to runtime/ObjC/Framework/ANTLRParserRuleReturnScope.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRPtrBuffer.h b/runtime/ObjC/Framework/ANTLRPtrBuffer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRPtrBuffer.h rename to runtime/ObjC/Framework/ANTLRPtrBuffer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRPtrBuffer.m b/runtime/ObjC/Framework/ANTLRPtrBuffer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRPtrBuffer.m rename to runtime/ObjC/Framework/ANTLRPtrBuffer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRPtrStack.h b/runtime/ObjC/Framework/ANTLRPtrStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRPtrStack.h rename to runtime/ObjC/Framework/ANTLRPtrStack.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRPtrStack.m b/runtime/ObjC/Framework/ANTLRPtrStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRPtrStack.m rename to runtime/ObjC/Framework/ANTLRPtrStack.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRReaderStream.h b/runtime/ObjC/Framework/ANTLRReaderStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRReaderStream.h rename to runtime/ObjC/Framework/ANTLRReaderStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRReaderStream.m b/runtime/ObjC/Framework/ANTLRReaderStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRReaderStream.m rename to runtime/ObjC/Framework/ANTLRReaderStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRecognitionException.h b/runtime/ObjC/Framework/ANTLRRecognitionException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRecognitionException.h rename to runtime/ObjC/Framework/ANTLRRecognitionException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRecognitionException.m b/runtime/ObjC/Framework/ANTLRRecognitionException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRecognitionException.m rename to runtime/ObjC/Framework/ANTLRRecognitionException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRecognizerSharedState.h b/runtime/ObjC/Framework/ANTLRRecognizerSharedState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRecognizerSharedState.h rename to runtime/ObjC/Framework/ANTLRRecognizerSharedState.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRecognizerSharedState.m b/runtime/ObjC/Framework/ANTLRRecognizerSharedState.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRecognizerSharedState.m rename to runtime/ObjC/Framework/ANTLRRecognizerSharedState.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.h b/runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.h rename to runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.m b/runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.m rename to runtime/ObjC/Framework/ANTLRRewriteRuleElementStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.h b/runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.h rename to runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.m b/runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.m rename to runtime/ObjC/Framework/ANTLRRewriteRuleNodeStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.h b/runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.h rename to runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.m b/runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.m rename to runtime/ObjC/Framework/ANTLRRewriteRuleSubtreeStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.h b/runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.h rename to runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.m b/runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.m rename to runtime/ObjC/Framework/ANTLRRewriteRuleTokenStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMapElement.h b/runtime/ObjC/Framework/ANTLRRuleMapElement.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMapElement.h rename to runtime/ObjC/Framework/ANTLRRuleMapElement.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMapElement.m b/runtime/ObjC/Framework/ANTLRRuleMapElement.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMapElement.m rename to runtime/ObjC/Framework/ANTLRRuleMapElement.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMemo.h b/runtime/ObjC/Framework/ANTLRRuleMemo.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMemo.h rename to runtime/ObjC/Framework/ANTLRRuleMemo.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMemo.m b/runtime/ObjC/Framework/ANTLRRuleMemo.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleMemo.m rename to runtime/ObjC/Framework/ANTLRRuleMemo.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleReturnScope.h b/runtime/ObjC/Framework/ANTLRRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleReturnScope.h rename to runtime/ObjC/Framework/ANTLRRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleReturnScope.m b/runtime/ObjC/Framework/ANTLRRuleReturnScope.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleReturnScope.m rename to runtime/ObjC/Framework/ANTLRRuleReturnScope.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleStack.h b/runtime/ObjC/Framework/ANTLRRuleStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleStack.h rename to runtime/ObjC/Framework/ANTLRRuleStack.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuleStack.m b/runtime/ObjC/Framework/ANTLRRuleStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuleStack.m rename to runtime/ObjC/Framework/ANTLRRuleStack.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuntimeException.h b/runtime/ObjC/Framework/ANTLRRuntimeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuntimeException.h rename to runtime/ObjC/Framework/ANTLRRuntimeException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRRuntimeException.m b/runtime/ObjC/Framework/ANTLRRuntimeException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRRuntimeException.m rename to runtime/ObjC/Framework/ANTLRRuntimeException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRStreamEnumerator.h b/runtime/ObjC/Framework/ANTLRStreamEnumerator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRStreamEnumerator.h rename to runtime/ObjC/Framework/ANTLRStreamEnumerator.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRStreamEnumerator.m b/runtime/ObjC/Framework/ANTLRStreamEnumerator.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRStreamEnumerator.m rename to runtime/ObjC/Framework/ANTLRStreamEnumerator.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRStringStream.h b/runtime/ObjC/Framework/ANTLRStringStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRStringStream.h rename to runtime/ObjC/Framework/ANTLRStringStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRStringStream.m b/runtime/ObjC/Framework/ANTLRStringStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRStringStream.m rename to runtime/ObjC/Framework/ANTLRStringStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRStringStreamState.h b/runtime/ObjC/Framework/ANTLRStringStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRStringStreamState.h rename to runtime/ObjC/Framework/ANTLRStringStreamState.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRStringStreamTest-Info.plist b/runtime/ObjC/Framework/ANTLRStringStreamTest-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRStringStreamTest-Info.plist rename to runtime/ObjC/Framework/ANTLRStringStreamTest-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRSymbolStack.h b/runtime/ObjC/Framework/ANTLRSymbolStack.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRSymbolStack.h rename to runtime/ObjC/Framework/ANTLRSymbolStack.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRSymbolStack.m b/runtime/ObjC/Framework/ANTLRSymbolStack.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRSymbolStack.m rename to runtime/ObjC/Framework/ANTLRSymbolStack.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.h b/runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.h rename to runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.m b/runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.m rename to runtime/ObjC/Framework/ANTLRToken+DebuggerSupport.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRToken.h b/runtime/ObjC/Framework/ANTLRToken.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRToken.h rename to runtime/ObjC/Framework/ANTLRToken.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTokenRewriteStream.h b/runtime/ObjC/Framework/ANTLRTokenRewriteStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTokenRewriteStream.h rename to runtime/ObjC/Framework/ANTLRTokenRewriteStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTokenRewriteStream.m b/runtime/ObjC/Framework/ANTLRTokenRewriteStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTokenRewriteStream.m rename to runtime/ObjC/Framework/ANTLRTokenRewriteStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTokenSource.h b/runtime/ObjC/Framework/ANTLRTokenSource.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTokenSource.h rename to runtime/ObjC/Framework/ANTLRTokenSource.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTokenStream.h b/runtime/ObjC/Framework/ANTLRTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTokenStream.h rename to runtime/ObjC/Framework/ANTLRTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTree.h b/runtime/ObjC/Framework/ANTLRTree.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTree.h rename to runtime/ObjC/Framework/ANTLRTree.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTree.m b/runtime/ObjC/Framework/ANTLRTree.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTree.m rename to runtime/ObjC/Framework/ANTLRTree.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeAdaptor.h b/runtime/ObjC/Framework/ANTLRTreeAdaptor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeAdaptor.h rename to runtime/ObjC/Framework/ANTLRTreeAdaptor.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeAdaptor.m b/runtime/ObjC/Framework/ANTLRTreeAdaptor.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeAdaptor.m rename to runtime/ObjC/Framework/ANTLRTreeAdaptor.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeException.h b/runtime/ObjC/Framework/ANTLRTreeException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeException.h rename to runtime/ObjC/Framework/ANTLRTreeException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeException.m b/runtime/ObjC/Framework/ANTLRTreeException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeException.m rename to runtime/ObjC/Framework/ANTLRTreeException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeIterator.h b/runtime/ObjC/Framework/ANTLRTreeIterator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeIterator.h rename to runtime/ObjC/Framework/ANTLRTreeIterator.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeIterator.m b/runtime/ObjC/Framework/ANTLRTreeIterator.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeIterator.m rename to runtime/ObjC/Framework/ANTLRTreeIterator.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeNodeStream.h b/runtime/ObjC/Framework/ANTLRTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeNodeStream.h rename to runtime/ObjC/Framework/ANTLRTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeParser.h b/runtime/ObjC/Framework/ANTLRTreeParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeParser.h rename to runtime/ObjC/Framework/ANTLRTreeParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeParser.m b/runtime/ObjC/Framework/ANTLRTreeParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeParser.m rename to runtime/ObjC/Framework/ANTLRTreeParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternLexer.h b/runtime/ObjC/Framework/ANTLRTreePatternLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternLexer.h rename to runtime/ObjC/Framework/ANTLRTreePatternLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternLexer.m b/runtime/ObjC/Framework/ANTLRTreePatternLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternLexer.m rename to runtime/ObjC/Framework/ANTLRTreePatternLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternParser.h b/runtime/ObjC/Framework/ANTLRTreePatternParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternParser.h rename to runtime/ObjC/Framework/ANTLRTreePatternParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternParser.m b/runtime/ObjC/Framework/ANTLRTreePatternParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreePatternParser.m rename to runtime/ObjC/Framework/ANTLRTreePatternParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRewriter.h b/runtime/ObjC/Framework/ANTLRTreeRewriter.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRewriter.h rename to runtime/ObjC/Framework/ANTLRTreeRewriter.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRewriter.m b/runtime/ObjC/Framework/ANTLRTreeRewriter.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRewriter.m rename to runtime/ObjC/Framework/ANTLRTreeRewriter.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.h b/runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.h rename to runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.m b/runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.m rename to runtime/ObjC/Framework/ANTLRTreeRuleReturnScope.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitor.h b/runtime/ObjC/Framework/ANTLRTreeVisitor.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitor.h rename to runtime/ObjC/Framework/ANTLRTreeVisitor.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitor.m b/runtime/ObjC/Framework/ANTLRTreeVisitor.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitor.m rename to runtime/ObjC/Framework/ANTLRTreeVisitor.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitorAction.h b/runtime/ObjC/Framework/ANTLRTreeVisitorAction.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitorAction.h rename to runtime/ObjC/Framework/ANTLRTreeVisitorAction.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitorAction.m b/runtime/ObjC/Framework/ANTLRTreeVisitorAction.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeVisitorAction.m rename to runtime/ObjC/Framework/ANTLRTreeVisitorAction.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeWizard.h b/runtime/ObjC/Framework/ANTLRTreeWizard.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeWizard.h rename to runtime/ObjC/Framework/ANTLRTreeWizard.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRTreeWizard.m b/runtime/ObjC/Framework/ANTLRTreeWizard.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRTreeWizard.m rename to runtime/ObjC/Framework/ANTLRTreeWizard.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.h b/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.h rename to runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.m b/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.m rename to runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.h b/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.h rename to runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.m b/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.m rename to runtime/ObjC/Framework/ANTLRUnbufferedCommonTreeNodeStreamState.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.h b/runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.h rename to runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.m b/runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.m rename to runtime/ObjC/Framework/ANTLRUnbufferedTokenStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUniqueIDMap.h b/runtime/ObjC/Framework/ANTLRUniqueIDMap.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUniqueIDMap.h rename to runtime/ObjC/Framework/ANTLRUniqueIDMap.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUniqueIDMap.m b/runtime/ObjC/Framework/ANTLRUniqueIDMap.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUniqueIDMap.m rename to runtime/ObjC/Framework/ANTLRUniqueIDMap.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnwantedTokenException.h b/runtime/ObjC/Framework/ANTLRUnwantedTokenException.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnwantedTokenException.h rename to runtime/ObjC/Framework/ANTLRUnwantedTokenException.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLRUnwantedTokenException.m b/runtime/ObjC/Framework/ANTLRUnwantedTokenException.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLRUnwantedTokenException.m rename to runtime/ObjC/Framework/ANTLRUnwantedTokenException.m diff --git a/antlr-3.4/runtime/ObjC/Framework/ANTLR_Prefix.pch b/runtime/ObjC/Framework/ANTLR_Prefix.pch similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ANTLR_Prefix.pch rename to runtime/ObjC/Framework/ANTLR_Prefix.pch diff --git a/antlr-3.4/runtime/ObjC/Framework/ArrayIterator.h b/runtime/ObjC/Framework/ArrayIterator.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ArrayIterator.h rename to runtime/ObjC/Framework/ArrayIterator.h diff --git a/antlr-3.4/runtime/ObjC/Framework/ArrayIterator.m b/runtime/ObjC/Framework/ArrayIterator.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/ArrayIterator.m rename to runtime/ObjC/Framework/ArrayIterator.m diff --git a/antlr-3.4/runtime/ObjC/Framework/CHANGES.txt b/runtime/ObjC/Framework/CHANGES.txt similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/CHANGES.txt rename to runtime/ObjC/Framework/CHANGES.txt diff --git a/antlr-3.4/runtime/ObjC/Framework/English.lproj/InfoPlist.strings b/runtime/ObjC/Framework/English.lproj/InfoPlist.strings similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/English.lproj/InfoPlist.strings rename to runtime/ObjC/Framework/English.lproj/InfoPlist.strings diff --git a/antlr-3.4/runtime/ObjC/Framework/FastQueue.h b/runtime/ObjC/Framework/FastQueue.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/FastQueue.h rename to runtime/ObjC/Framework/FastQueue.h diff --git a/antlr-3.4/runtime/ObjC/Framework/FastQueue.m b/runtime/ObjC/Framework/FastQueue.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/FastQueue.m rename to runtime/ObjC/Framework/FastQueue.m diff --git a/antlr-3.4/runtime/ObjC/Framework/Info.plist b/runtime/ObjC/Framework/Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/Info.plist rename to runtime/ObjC/Framework/Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/IntArray.h b/runtime/ObjC/Framework/IntArray.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/IntArray.h rename to runtime/ObjC/Framework/IntArray.h diff --git a/antlr-3.4/runtime/ObjC/Framework/IntArray.m b/runtime/ObjC/Framework/IntArray.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/IntArray.m rename to runtime/ObjC/Framework/IntArray.m diff --git a/antlr-3.4/runtime/ObjC/Framework/LookaheadStream.h b/runtime/ObjC/Framework/LookaheadStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/LookaheadStream.h rename to runtime/ObjC/Framework/LookaheadStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/LookaheadStream.m b/runtime/ObjC/Framework/LookaheadStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/LookaheadStream.m rename to runtime/ObjC/Framework/LookaheadStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/README.rtf b/runtime/ObjC/Framework/README.rtf similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/README.rtf rename to runtime/ObjC/Framework/README.rtf diff --git a/antlr-3.4/runtime/ObjC/Framework/Test-Info.plist b/runtime/ObjC/Framework/Test-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/Test-Info.plist rename to runtime/ObjC/Framework/Test-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/Tests-Info.plist b/runtime/ObjC/Framework/Tests-Info.plist similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/Tests-Info.plist rename to runtime/ObjC/Framework/Tests-Info.plist diff --git a/antlr-3.4/runtime/ObjC/Framework/antlr3.h b/runtime/ObjC/Framework/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/antlr3.h rename to runtime/ObjC/Framework/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseMapElement.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseMapElement.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseMapElement.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseMapElement.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseRecognizer.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseRecognizer.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseRecognizer.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseRecognizer.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseStack.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseStack.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseStack.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseStack.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTree.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTree.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTree.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTree.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTreeAdaptor.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTreeAdaptor.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTreeAdaptor.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBaseTreeAdaptor.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBitSet.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBitSet.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBitSet.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBitSet.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTokenStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTokenStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTokenStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTokenStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTreeNodeStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTreeNodeStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTreeNodeStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRBufferedTreeNodeStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCharStreamState.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCharStreamState.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCharStreamState.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCharStreamState.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonErrorNode.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonErrorNode.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonErrorNode.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonErrorNode.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonToken.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonToken.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonToken.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonToken.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTokenStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTokenStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTokenStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTokenStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTree.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTree.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTree.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTree.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeAdaptor.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeAdaptor.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeAdaptor.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeAdaptor.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeNodeStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeNodeStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeNodeStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRCommonTreeNodeStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLREarlyExitException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLREarlyExitException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLREarlyExitException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLREarlyExitException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFailedPredicateException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFailedPredicateException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFailedPredicateException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFailedPredicateException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFastQueue.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFastQueue.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFastQueue.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRFastQueue.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashMap.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashMap.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashMap.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashMap.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashRule.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashRule.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashRule.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRHashRule.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRIntArray.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRIntArray.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRIntArray.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRIntArray.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexer.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexer.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexer.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexer.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexerRuleReturnScope.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexerRuleReturnScope.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexerRuleReturnScope.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLexerRuleReturnScope.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLinkBase.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLinkBase.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLinkBase.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLinkBase.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLookaheadStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLookaheadStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLookaheadStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRLookaheadStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMap.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMap.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMap.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMap.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMapElement.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMapElement.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMapElement.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMapElement.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedNotSetException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedNotSetException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedNotSetException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedNotSetException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedRangeException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedRangeException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedRangeException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedRangeException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedSetException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedSetException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedSetException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedSetException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTokenException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTokenException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTokenException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTokenException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTreeNodeException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTreeNodeException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTreeNodeException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMismatchedTreeNodeException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMissingTokenException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMissingTokenException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMissingTokenException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRMissingTokenException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNoViableAltException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNoViableAltException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNoViableAltException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNoViableAltException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNodeMapElement.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNodeMapElement.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNodeMapElement.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRNodeMapElement.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParseTree.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParseTree.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParseTree.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParseTree.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParser.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParser.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParser.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParser.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParserRuleReturnScope.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParserRuleReturnScope.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParserRuleReturnScope.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRParserRuleReturnScope.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRPtrBuffer.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRPtrBuffer.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRPtrBuffer.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRPtrBuffer.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognitionException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognitionException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognitionException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognitionException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognizerSharedState.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognizerSharedState.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognizerSharedState.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRecognizerSharedState.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleElementStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleElementStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleElementStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleElementStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleSubtreeStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleSubtreeStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleSubtreeStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleSubtreeStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleTokenStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleTokenStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleTokenStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRewriteRuleTokenStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMapElement.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMapElement.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMapElement.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMapElement.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMemo.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMemo.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMemo.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleMemo.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleReturnScope.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleReturnScope.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleReturnScope.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleReturnScope.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleStack.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleStack.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleStack.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuleStack.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuntimeException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuntimeException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuntimeException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRRuntimeException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStreamEnumerator.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStreamEnumerator.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStreamEnumerator.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStreamEnumerator.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStringStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStringStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStringStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRStringStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRSymbolStack.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRSymbolStack.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRSymbolStack.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRSymbolStack.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRToken+DebuggerSupport.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRToken+DebuggerSupport.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRToken+DebuggerSupport.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRToken+DebuggerSupport.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTokenRewriteStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTokenRewriteStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTokenRewriteStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTokenRewriteStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeIterator.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeIterator.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeIterator.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeIterator.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeParser.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeParser.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeParser.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeParser.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternLexer.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternLexer.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternLexer.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternLexer.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternParser.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternParser.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternParser.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreePatternParser.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRewriter.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRewriter.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRewriter.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRewriter.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRuleReturnScope.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRuleReturnScope.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRuleReturnScope.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeRuleReturnScope.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitor.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitor.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitor.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitor.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitorAction.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitorAction.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitorAction.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeVisitorAction.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeWizard.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeWizard.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeWizard.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRTreeWizard.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnbufferedTokenStream.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnbufferedTokenStream.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnbufferedTokenStream.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnbufferedTokenStream.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUniqueIDMap.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUniqueIDMap.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUniqueIDMap.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUniqueIDMap.o diff --git a/antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnwantedTokenException.o b/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnwantedTokenException.o similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnwantedTokenException.o rename to runtime/ObjC/Framework/build/ANTLR.build/Debug/ANTLR.build/Objects-normal/i386/ANTLRUnwantedTokenException.o diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleC.tokens b/runtime/ObjC/Framework/examples/LL-star/SimpleC.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleC.tokens rename to runtime/ObjC/Framework/examples/LL-star/SimpleC.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.h b/runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.h rename to runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.m b/runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.m rename to runtime/ObjC/Framework/examples/LL-star/SimpleCLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCParser.h b/runtime/ObjC/Framework/examples/LL-star/SimpleCParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCParser.h rename to runtime/ObjC/Framework/examples/LL-star/SimpleCParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCParser.m b/runtime/ObjC/Framework/examples/LL-star/SimpleCParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleCParser.m rename to runtime/ObjC/Framework/examples/LL-star/SimpleCParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleC__.gl b/runtime/ObjC/Framework/examples/LL-star/SimpleC__.gl similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/SimpleC__.gl rename to runtime/ObjC/Framework/examples/LL-star/SimpleC__.gl diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/antlr3.h b/runtime/ObjC/Framework/examples/LL-star/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/antlr3.h rename to runtime/ObjC/Framework/examples/LL-star/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/input b/runtime/ObjC/Framework/examples/LL-star/input similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/input rename to runtime/ObjC/Framework/examples/LL-star/input diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/main.m b/runtime/ObjC/Framework/examples/LL-star/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/main.m rename to runtime/ObjC/Framework/examples/LL-star/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/output b/runtime/ObjC/Framework/examples/LL-star/output similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/output rename to runtime/ObjC/Framework/examples/LL-star/output diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/LL-star/simplec.g b/runtime/ObjC/Framework/examples/LL-star/simplec.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/LL-star/simplec.g rename to runtime/ObjC/Framework/examples/LL-star/simplec.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/Combined.g b/runtime/ObjC/Framework/examples/combined/Combined.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/Combined.g rename to runtime/ObjC/Framework/examples/combined/Combined.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/Combined.tokens b/runtime/ObjC/Framework/examples/combined/Combined.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/Combined.tokens rename to runtime/ObjC/Framework/examples/combined/Combined.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedLexer.h b/runtime/ObjC/Framework/examples/combined/CombinedLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedLexer.h rename to runtime/ObjC/Framework/examples/combined/CombinedLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedLexer.m b/runtime/ObjC/Framework/examples/combined/CombinedLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedLexer.m rename to runtime/ObjC/Framework/examples/combined/CombinedLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedParser.h b/runtime/ObjC/Framework/examples/combined/CombinedParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedParser.h rename to runtime/ObjC/Framework/examples/combined/CombinedParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedParser.m b/runtime/ObjC/Framework/examples/combined/CombinedParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/CombinedParser.m rename to runtime/ObjC/Framework/examples/combined/CombinedParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/Combined__.gl b/runtime/ObjC/Framework/examples/combined/Combined__.gl similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/Combined__.gl rename to runtime/ObjC/Framework/examples/combined/Combined__.gl diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/antlr3.h b/runtime/ObjC/Framework/examples/combined/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/antlr3.h rename to runtime/ObjC/Framework/examples/combined/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/main.m b/runtime/ObjC/Framework/examples/combined/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/main.m rename to runtime/ObjC/Framework/examples/combined/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/combined/output1/Combined.tokens b/runtime/ObjC/Framework/examples/combined/output1/Combined.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/combined/output1/Combined.tokens rename to runtime/ObjC/Framework/examples/combined/output1/Combined.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.g b/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.g rename to runtime/ObjC/Framework/examples/fuzzy/Fuzzy.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.h b/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.h rename to runtime/ObjC/Framework/examples/fuzzy/Fuzzy.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.m b/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.m rename to runtime/ObjC/Framework/examples/fuzzy/Fuzzy.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.tokens b/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/Fuzzy.tokens rename to runtime/ObjC/Framework/examples/fuzzy/Fuzzy.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/FuzzyLexer.h b/runtime/ObjC/Framework/examples/fuzzy/FuzzyLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/FuzzyLexer.h rename to runtime/ObjC/Framework/examples/fuzzy/FuzzyLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/antlr3.h b/runtime/ObjC/Framework/examples/fuzzy/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/antlr3.h rename to runtime/ObjC/Framework/examples/fuzzy/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/input b/runtime/ObjC/Framework/examples/fuzzy/input similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/input rename to runtime/ObjC/Framework/examples/fuzzy/input diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/main.m b/runtime/ObjC/Framework/examples/fuzzy/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/main.m rename to runtime/ObjC/Framework/examples/fuzzy/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.m b/runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.m rename to runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.tokens b/runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.tokens rename to runtime/ObjC/Framework/examples/fuzzy/output1/Fuzzy.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/output1/FuzzyLexer.h b/runtime/ObjC/Framework/examples/fuzzy/output1/FuzzyLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/fuzzy/output1/FuzzyLexer.h rename to runtime/ObjC/Framework/examples/fuzzy/output1/FuzzyLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/T.g b/runtime/ObjC/Framework/examples/hoistedPredicates/T.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/T.g rename to runtime/ObjC/Framework/examples/hoistedPredicates/T.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/T.tokens b/runtime/ObjC/Framework/examples/hoistedPredicates/T.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/T.tokens rename to runtime/ObjC/Framework/examples/hoistedPredicates/T.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.h b/runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.h rename to runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.m b/runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.m rename to runtime/ObjC/Framework/examples/hoistedPredicates/TLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TParser.h b/runtime/ObjC/Framework/examples/hoistedPredicates/TParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TParser.h rename to runtime/ObjC/Framework/examples/hoistedPredicates/TParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TParser.m b/runtime/ObjC/Framework/examples/hoistedPredicates/TParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/TParser.m rename to runtime/ObjC/Framework/examples/hoistedPredicates/TParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/antlr3.h b/runtime/ObjC/Framework/examples/hoistedPredicates/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/antlr3.h rename to runtime/ObjC/Framework/examples/hoistedPredicates/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/input b/runtime/ObjC/Framework/examples/hoistedPredicates/input similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/input rename to runtime/ObjC/Framework/examples/hoistedPredicates/input diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/main.m b/runtime/ObjC/Framework/examples/hoistedPredicates/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/main.m rename to runtime/ObjC/Framework/examples/hoistedPredicates/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/output b/runtime/ObjC/Framework/examples/hoistedPredicates/output similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/hoistedPredicates/output rename to runtime/ObjC/Framework/examples/hoistedPredicates/output diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/Test.tokens b/runtime/ObjC/Framework/examples/lexertest-simple/Test.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/Test.tokens rename to runtime/ObjC/Framework/examples/lexertest-simple/Test.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.g b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.g rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h.old b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h.old similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h.old rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.h.old diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m.old b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m.old similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m.old rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.m.old diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.tokens b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.tokens rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexer.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexerLexer.h b/runtime/ObjC/Framework/examples/lexertest-simple/TestLexerLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/TestLexerLexer.h rename to runtime/ObjC/Framework/examples/lexertest-simple/TestLexerLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/antlr3.h b/runtime/ObjC/Framework/examples/lexertest-simple/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/antlr3.h rename to runtime/ObjC/Framework/examples/lexertest-simple/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/main.m b/runtime/ObjC/Framework/examples/lexertest-simple/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/main.m rename to runtime/ObjC/Framework/examples/lexertest-simple/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/Test.tokens b/runtime/ObjC/Framework/examples/lexertest-simple/output1/Test.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/Test.tokens rename to runtime/ObjC/Framework/examples/lexertest-simple/output1/Test.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.h b/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.h rename to runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.tokens b/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.tokens rename to runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexer.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexerLexer.h b/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexerLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexerLexer.h rename to runtime/ObjC/Framework/examples/lexertest-simple/output1/TestLexerLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/Testlexer.m b/runtime/ObjC/Framework/examples/lexertest-simple/output1/Testlexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/lexertest-simple/output1/Testlexer.m rename to runtime/ObjC/Framework/examples/lexertest-simple/output1/Testlexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTable.g b/runtime/ObjC/Framework/examples/scopes/SymbolTable.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTable.g rename to runtime/ObjC/Framework/examples/scopes/SymbolTable.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTable.tokens b/runtime/ObjC/Framework/examples/scopes/SymbolTable.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTable.tokens rename to runtime/ObjC/Framework/examples/scopes/SymbolTable.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.h b/runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.h rename to runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.m b/runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.m rename to runtime/ObjC/Framework/examples/scopes/SymbolTableLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableParser.h b/runtime/ObjC/Framework/examples/scopes/SymbolTableParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableParser.h rename to runtime/ObjC/Framework/examples/scopes/SymbolTableParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableParser.m b/runtime/ObjC/Framework/examples/scopes/SymbolTableParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTableParser.m rename to runtime/ObjC/Framework/examples/scopes/SymbolTableParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTable__.gl b/runtime/ObjC/Framework/examples/scopes/SymbolTable__.gl similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/SymbolTable__.gl rename to runtime/ObjC/Framework/examples/scopes/SymbolTable__.gl diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/antlr3.h b/runtime/ObjC/Framework/examples/scopes/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/antlr3.h rename to runtime/ObjC/Framework/examples/scopes/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/input b/runtime/ObjC/Framework/examples/scopes/input similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/input rename to runtime/ObjC/Framework/examples/scopes/input diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/main.m b/runtime/ObjC/Framework/examples/scopes/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/main.m rename to runtime/ObjC/Framework/examples/scopes/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/output b/runtime/ObjC/Framework/examples/scopes/output similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/output rename to runtime/ObjC/Framework/examples/scopes/output diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTable.tokens b/runtime/ObjC/Framework/examples/scopes/output1/SymbolTable.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTable.tokens rename to runtime/ObjC/Framework/examples/scopes/output1/SymbolTable.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.h b/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.h rename to runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.m b/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.m rename to runtime/ObjC/Framework/examples/scopes/output1/SymbolTableLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.h b/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.h rename to runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.m b/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.m rename to runtime/ObjC/Framework/examples/scopes/output1/SymbolTableParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.g b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.g rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.tokens b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.tokens rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.h b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.java b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.java rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.m b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.h b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.java b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.java rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.m b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.g b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.g rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.h b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.java b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.java rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.m b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.tokens b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.tokens rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleCTP.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC__.gl b/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC__.gl similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC__.gl rename to runtime/ObjC/Framework/examples/simplecTreeParser/SimpleC__.gl diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/antlr3.h b/runtime/ObjC/Framework/examples/simplecTreeParser/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/antlr3.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/input b/runtime/ObjC/Framework/examples/simplecTreeParser/input similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/input rename to runtime/ObjC/Framework/examples/simplecTreeParser/input diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/main.m b/runtime/ObjC/Framework/examples/simplecTreeParser/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/main.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output b/runtime/ObjC/Framework/examples/simplecTreeParser/output similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output rename to runtime/ObjC/Framework/examples/simplecTreeParser/output diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleC.tokens b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleC.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleC.tokens rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleC.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.h b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.java b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.java rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.m b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.h b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.java b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.java rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.m b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.h b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.h rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.java b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.java rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.m b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.m rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.tokens b/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.tokens rename to runtime/ObjC/Framework/examples/simplecTreeParser/output1/SimpleCTP.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/Lang.g b/runtime/ObjC/Framework/examples/treeparser/Lang.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/Lang.g rename to runtime/ObjC/Framework/examples/treeparser/Lang.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/Lang.tokens b/runtime/ObjC/Framework/examples/treeparser/Lang.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/Lang.tokens rename to runtime/ObjC/Framework/examples/treeparser/Lang.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.g b/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.g rename to runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.h b/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.h rename to runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.m b/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.m rename to runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.tokens b/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.tokens rename to runtime/ObjC/Framework/examples/treeparser/LangDumpDecl.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangLexer.h b/runtime/ObjC/Framework/examples/treeparser/LangLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangLexer.h rename to runtime/ObjC/Framework/examples/treeparser/LangLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangLexer.m b/runtime/ObjC/Framework/examples/treeparser/LangLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangLexer.m rename to runtime/ObjC/Framework/examples/treeparser/LangLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangParser.h b/runtime/ObjC/Framework/examples/treeparser/LangParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangParser.h rename to runtime/ObjC/Framework/examples/treeparser/LangParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangParser.m b/runtime/ObjC/Framework/examples/treeparser/LangParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/LangParser.m rename to runtime/ObjC/Framework/examples/treeparser/LangParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/Main.java b/runtime/ObjC/Framework/examples/treeparser/Main.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/Main.java rename to runtime/ObjC/Framework/examples/treeparser/Main.java diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/README.txt b/runtime/ObjC/Framework/examples/treeparser/README.txt similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/README.txt rename to runtime/ObjC/Framework/examples/treeparser/README.txt diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/files b/runtime/ObjC/Framework/examples/treeparser/files similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/files rename to runtime/ObjC/Framework/examples/treeparser/files diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/input b/runtime/ObjC/Framework/examples/treeparser/input similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/input rename to runtime/ObjC/Framework/examples/treeparser/input diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/main.m b/runtime/ObjC/Framework/examples/treeparser/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/main.m rename to runtime/ObjC/Framework/examples/treeparser/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treeparser/output b/runtime/ObjC/Framework/examples/treeparser/output similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treeparser/output rename to runtime/ObjC/Framework/examples/treeparser/output diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.g b/runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.g similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.g rename to runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.g diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.tokens b/runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.tokens rename to runtime/ObjC/Framework/examples/treerewrite/TreeRewrite.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.h b/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.h rename to runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.m b/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.m rename to runtime/ObjC/Framework/examples/treerewrite/TreeRewriteLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.h b/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.h rename to runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.m b/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.m rename to runtime/ObjC/Framework/examples/treerewrite/TreeRewriteParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/antlr3.h b/runtime/ObjC/Framework/examples/treerewrite/antlr3.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/antlr3.h rename to runtime/ObjC/Framework/examples/treerewrite/antlr3.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/main.m b/runtime/ObjC/Framework/examples/treerewrite/main.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/main.m rename to runtime/ObjC/Framework/examples/treerewrite/main.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewrite.tokens b/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewrite.tokens similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewrite.tokens rename to runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewrite.tokens diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.h b/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.h rename to runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.m b/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.m rename to runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteLexer.m diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.h b/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.h rename to runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.h diff --git a/antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.m b/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.m rename to runtime/ObjC/Framework/examples/treerewrite/output1/TreeRewriteParser.m diff --git a/antlr-3.4/runtime/ObjC/Framework/filelist.java b/runtime/ObjC/Framework/filelist.java similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/filelist.java rename to runtime/ObjC/Framework/filelist.java diff --git a/antlr-3.4/runtime/ObjC/Framework/filelist.objc b/runtime/ObjC/Framework/filelist.objc similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/filelist.objc rename to runtime/ObjC/Framework/filelist.objc diff --git a/antlr-3.4/runtime/ObjC/Framework/java src b/runtime/ObjC/Framework/java src similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/java src rename to runtime/ObjC/Framework/java src diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.h b/runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.h rename to runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.m b/runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.m rename to runtime/ObjC/Framework/test/runtime/TestRewriteRuleTokenStream/TestRewriteRuleTokenStream.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.h b/runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.h rename to runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.m b/runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.m rename to runtime/ObjC/Framework/test/runtime/misc/ANTLRFastQueueTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.h b/runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.h rename to runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.m b/runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.m rename to runtime/ObjC/Framework/test/runtime/misc/ANTLRIntArrayTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.h b/runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.h rename to runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.m b/runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.m rename to runtime/ObjC/Framework/test/runtime/misc/IntArrayTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/TestDictionary.h b/runtime/ObjC/Framework/test/runtime/misc/TestDictionary.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/TestDictionary.h rename to runtime/ObjC/Framework/test/runtime/misc/TestDictionary.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/TestDictionary.m b/runtime/ObjC/Framework/test/runtime/misc/TestDictionary.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/misc/TestDictionary.m rename to runtime/ObjC/Framework/test/runtime/misc/TestDictionary.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.h b/runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.h rename to runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.m b/runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.m rename to runtime/ObjC/Framework/test/runtime/recognizer/ANTLRRecognizerTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.h b/runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.h rename to runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.m b/runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.m rename to runtime/ObjC/Framework/test/runtime/sets/ANTLRBitSetTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.h b/runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.h rename to runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.m b/runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.m rename to runtime/ObjC/Framework/test/runtime/stream/ANTLRStringStreamTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.h b/runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.h rename to runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.m b/runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.m rename to runtime/ObjC/Framework/test/runtime/token/ANTLRCommonTokenTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.h b/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.h rename to runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.m b/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.m rename to runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonErrorNodeTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.h b/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.h rename to runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.m b/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.m rename to runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeAdaptorTest.m diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.h b/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.h similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.h rename to runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.h diff --git a/antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.m b/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.m similarity index 100% rename from antlr-3.4/runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.m rename to runtime/ObjC/Framework/test/runtime/tree/ANTLRCommonTreeTest.m diff --git a/antlr-3.4/runtime/ObjC/README b/runtime/ObjC/README similarity index 100% rename from antlr-3.4/runtime/ObjC/README rename to runtime/ObjC/README diff --git a/antlr-3.4/runtime/Perl5/.p4ignore b/runtime/Perl5/.p4ignore similarity index 100% rename from antlr-3.4/runtime/Perl5/.p4ignore rename to runtime/Perl5/.p4ignore diff --git a/antlr-3.4/runtime/Perl5/Build.PL b/runtime/Perl5/Build.PL similarity index 100% rename from antlr-3.4/runtime/Perl5/Build.PL rename to runtime/Perl5/Build.PL diff --git a/antlr-3.4/runtime/Perl5/Changes b/runtime/Perl5/Changes similarity index 100% rename from antlr-3.4/runtime/Perl5/Changes rename to runtime/Perl5/Changes diff --git a/antlr-3.4/runtime/Perl5/INSTALL b/runtime/Perl5/INSTALL similarity index 100% rename from antlr-3.4/runtime/Perl5/INSTALL rename to runtime/Perl5/INSTALL diff --git a/antlr-3.4/runtime/Perl5/MANIFEST b/runtime/Perl5/MANIFEST similarity index 100% rename from antlr-3.4/runtime/Perl5/MANIFEST rename to runtime/Perl5/MANIFEST diff --git a/antlr-3.4/runtime/Perl5/MANIFEST.SKIP b/runtime/Perl5/MANIFEST.SKIP similarity index 100% rename from antlr-3.4/runtime/Perl5/MANIFEST.SKIP rename to runtime/Perl5/MANIFEST.SKIP diff --git a/antlr-3.4/runtime/Perl5/Makefile.PL b/runtime/Perl5/Makefile.PL similarity index 100% rename from antlr-3.4/runtime/Perl5/Makefile.PL rename to runtime/Perl5/Makefile.PL diff --git a/antlr-3.4/runtime/Perl5/README b/runtime/Perl5/README similarity index 100% rename from antlr-3.4/runtime/Perl5/README rename to runtime/Perl5/README diff --git a/antlr-3.4/runtime/Perl5/docs/design.pod b/runtime/Perl5/docs/design.pod similarity index 100% rename from antlr-3.4/runtime/Perl5/docs/design.pod rename to runtime/Perl5/docs/design.pod diff --git a/antlr-3.4/runtime/Perl5/examples/README b/runtime/Perl5/examples/README similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/README rename to runtime/Perl5/examples/README diff --git a/antlr-3.4/runtime/Perl5/examples/expr/Expr.g b/runtime/Perl5/examples/expr/Expr.g similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/expr/Expr.g rename to runtime/Perl5/examples/expr/Expr.g diff --git a/antlr-3.4/runtime/Perl5/examples/expr/expr.pl b/runtime/Perl5/examples/expr/expr.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/expr/expr.pl rename to runtime/Perl5/examples/expr/expr.pl diff --git a/antlr-3.4/runtime/Perl5/examples/id/IDLexer.g b/runtime/Perl5/examples/id/IDLexer.g similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/id/IDLexer.g rename to runtime/Perl5/examples/id/IDLexer.g diff --git a/antlr-3.4/runtime/Perl5/examples/id/id.pl b/runtime/Perl5/examples/id/id.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/id/id.pl rename to runtime/Perl5/examples/id/id.pl diff --git a/antlr-3.4/runtime/Perl5/examples/mexpr/MExpr.g b/runtime/Perl5/examples/mexpr/MExpr.g similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/mexpr/MExpr.g rename to runtime/Perl5/examples/mexpr/MExpr.g diff --git a/antlr-3.4/runtime/Perl5/examples/mexpr/mexpr.pl b/runtime/Perl5/examples/mexpr/mexpr.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/mexpr/mexpr.pl rename to runtime/Perl5/examples/mexpr/mexpr.pl diff --git a/antlr-3.4/runtime/Perl5/examples/simplecalc/SimpleCalc.g b/runtime/Perl5/examples/simplecalc/SimpleCalc.g similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/simplecalc/SimpleCalc.g rename to runtime/Perl5/examples/simplecalc/SimpleCalc.g diff --git a/antlr-3.4/runtime/Perl5/examples/simplecalc/simplecalc.pl b/runtime/Perl5/examples/simplecalc/simplecalc.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/simplecalc/simplecalc.pl rename to runtime/Perl5/examples/simplecalc/simplecalc.pl diff --git a/antlr-3.4/runtime/Perl5/examples/tweak/T.g b/runtime/Perl5/examples/tweak/T.g similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/tweak/T.g rename to runtime/Perl5/examples/tweak/T.g diff --git a/antlr-3.4/runtime/Perl5/examples/tweak/input b/runtime/Perl5/examples/tweak/input similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/tweak/input rename to runtime/Perl5/examples/tweak/input diff --git a/antlr-3.4/runtime/Perl5/examples/tweak/output b/runtime/Perl5/examples/tweak/output similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/tweak/output rename to runtime/Perl5/examples/tweak/output diff --git a/antlr-3.4/runtime/Perl5/examples/tweak/tweak.pl b/runtime/Perl5/examples/tweak/tweak.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/tweak/tweak.pl rename to runtime/Perl5/examples/tweak/tweak.pl diff --git a/antlr-3.4/runtime/Perl5/examples/zero-one/T.g b/runtime/Perl5/examples/zero-one/T.g similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/zero-one/T.g rename to runtime/Perl5/examples/zero-one/T.g diff --git a/antlr-3.4/runtime/Perl5/examples/zero-one/t-error.pl b/runtime/Perl5/examples/zero-one/t-error.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/zero-one/t-error.pl rename to runtime/Perl5/examples/zero-one/t-error.pl diff --git a/antlr-3.4/runtime/Perl5/examples/zero-one/t.pl b/runtime/Perl5/examples/zero-one/t.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/examples/zero-one/t.pl rename to runtime/Perl5/examples/zero-one/t.pl diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime.pm b/runtime/Perl5/lib/ANTLR/Runtime.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime.pm rename to runtime/Perl5/lib/ANTLR/Runtime.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/ANTLRFileStream.pm b/runtime/Perl5/lib/ANTLR/Runtime/ANTLRFileStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/ANTLRFileStream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/ANTLRFileStream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/ANTLRStringStream.pm b/runtime/Perl5/lib/ANTLR/Runtime/ANTLRStringStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/ANTLRStringStream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/ANTLRStringStream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/BaseRecognizer.pm b/runtime/Perl5/lib/ANTLR/Runtime/BaseRecognizer.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/BaseRecognizer.pm rename to runtime/Perl5/lib/ANTLR/Runtime/BaseRecognizer.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/BitSet.pm b/runtime/Perl5/lib/ANTLR/Runtime/BitSet.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/BitSet.pm rename to runtime/Perl5/lib/ANTLR/Runtime/BitSet.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CharStream.pm b/runtime/Perl5/lib/ANTLR/Runtime/CharStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CharStream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/CharStream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CharStreamState.pm b/runtime/Perl5/lib/ANTLR/Runtime/CharStreamState.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CharStreamState.pm rename to runtime/Perl5/lib/ANTLR/Runtime/CharStreamState.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CommonToken.pm b/runtime/Perl5/lib/ANTLR/Runtime/CommonToken.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CommonToken.pm rename to runtime/Perl5/lib/ANTLR/Runtime/CommonToken.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CommonTokenStream.pm b/runtime/Perl5/lib/ANTLR/Runtime/CommonTokenStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/CommonTokenStream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/CommonTokenStream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/DFA.pm b/runtime/Perl5/lib/ANTLR/Runtime/DFA.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/DFA.pm rename to runtime/Perl5/lib/ANTLR/Runtime/DFA.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/EarlyExitException.pm b/runtime/Perl5/lib/ANTLR/Runtime/EarlyExitException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/EarlyExitException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/EarlyExitException.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Exception.pm b/runtime/Perl5/lib/ANTLR/Runtime/Exception.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Exception.pm rename to runtime/Perl5/lib/ANTLR/Runtime/Exception.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/IntStream.pm b/runtime/Perl5/lib/ANTLR/Runtime/IntStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/IntStream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/IntStream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Lexer.pm b/runtime/Perl5/lib/ANTLR/Runtime/Lexer.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Lexer.pm rename to runtime/Perl5/lib/ANTLR/Runtime/Lexer.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/MismatchedSetException.pm b/runtime/Perl5/lib/ANTLR/Runtime/MismatchedSetException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/MismatchedSetException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/MismatchedSetException.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/MismatchedTokenException.pm b/runtime/Perl5/lib/ANTLR/Runtime/MismatchedTokenException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/MismatchedTokenException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/MismatchedTokenException.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/MissingTokenException.pm b/runtime/Perl5/lib/ANTLR/Runtime/MissingTokenException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/MissingTokenException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/MissingTokenException.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/NoViableAltException.pm b/runtime/Perl5/lib/ANTLR/Runtime/NoViableAltException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/NoViableAltException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/NoViableAltException.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Parser.pm b/runtime/Perl5/lib/ANTLR/Runtime/Parser.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Parser.pm rename to runtime/Perl5/lib/ANTLR/Runtime/Parser.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/ParserRuleReturnScope.pm b/runtime/Perl5/lib/ANTLR/Runtime/ParserRuleReturnScope.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/ParserRuleReturnScope.pm rename to runtime/Perl5/lib/ANTLR/Runtime/ParserRuleReturnScope.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/RecognitionException.pm b/runtime/Perl5/lib/ANTLR/Runtime/RecognitionException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/RecognitionException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/RecognitionException.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/RecognizerSharedState.pm b/runtime/Perl5/lib/ANTLR/Runtime/RecognizerSharedState.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/RecognizerSharedState.pm rename to runtime/Perl5/lib/ANTLR/Runtime/RecognizerSharedState.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/RuleReturnScope.pm b/runtime/Perl5/lib/ANTLR/Runtime/RuleReturnScope.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/RuleReturnScope.pm rename to runtime/Perl5/lib/ANTLR/Runtime/RuleReturnScope.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Stream.pm b/runtime/Perl5/lib/ANTLR/Runtime/Stream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Stream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/Stream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Token.pm b/runtime/Perl5/lib/ANTLR/Runtime/Token.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/Token.pm rename to runtime/Perl5/lib/ANTLR/Runtime/Token.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/TokenSource.pm b/runtime/Perl5/lib/ANTLR/Runtime/TokenSource.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/TokenSource.pm rename to runtime/Perl5/lib/ANTLR/Runtime/TokenSource.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/TokenStream.pm b/runtime/Perl5/lib/ANTLR/Runtime/TokenStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/TokenStream.pm rename to runtime/Perl5/lib/ANTLR/Runtime/TokenStream.pm diff --git a/antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/UnwantedTokenException.pm b/runtime/Perl5/lib/ANTLR/Runtime/UnwantedTokenException.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/lib/ANTLR/Runtime/UnwantedTokenException.pm rename to runtime/Perl5/lib/ANTLR/Runtime/UnwantedTokenException.pm diff --git a/antlr-3.4/runtime/Perl5/port.yml b/runtime/Perl5/port.yml similarity index 100% rename from antlr-3.4/runtime/Perl5/port.yml rename to runtime/Perl5/port.yml diff --git a/antlr-3.4/runtime/Perl5/t/author/api.t b/runtime/Perl5/t/author/api.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/author/api.t rename to runtime/Perl5/t/author/api.t diff --git a/antlr-3.4/runtime/Perl5/t/author/perlcritic.t b/runtime/Perl5/t/author/perlcritic.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/author/perlcritic.t rename to runtime/Perl5/t/author/perlcritic.t diff --git a/antlr-3.4/runtime/Perl5/t/author/perlcriticrc b/runtime/Perl5/t/author/perlcriticrc similarity index 100% rename from antlr-3.4/runtime/Perl5/t/author/perlcriticrc rename to runtime/Perl5/t/author/perlcriticrc diff --git a/antlr-3.4/runtime/Perl5/t/author/pod-coverage.t b/runtime/Perl5/t/author/pod-coverage.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/author/pod-coverage.t rename to runtime/Perl5/t/author/pod-coverage.t diff --git a/antlr-3.4/runtime/Perl5/t/author/pod.t b/runtime/Perl5/t/author/pod.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/author/pod.t rename to runtime/Perl5/t/author/pod.t diff --git a/antlr-3.4/runtime/Perl5/t/classes.t b/runtime/Perl5/t/classes.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/classes.t rename to runtime/Perl5/t/classes.t diff --git a/antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/ANTLRStringStream.pm b/runtime/Perl5/t/classes/Test/ANTLR/Runtime/ANTLRStringStream.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/ANTLRStringStream.pm rename to runtime/Perl5/t/classes/Test/ANTLR/Runtime/ANTLRStringStream.pm diff --git a/antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/BitSet.pm b/runtime/Perl5/t/classes/Test/ANTLR/Runtime/BitSet.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/BitSet.pm rename to runtime/Perl5/t/classes/Test/ANTLR/Runtime/BitSet.pm diff --git a/antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/CommonToken.pm b/runtime/Perl5/t/classes/Test/ANTLR/Runtime/CommonToken.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/CommonToken.pm rename to runtime/Perl5/t/classes/Test/ANTLR/Runtime/CommonToken.pm diff --git a/antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/Exception.pm b/runtime/Perl5/t/classes/Test/ANTLR/Runtime/Exception.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/Exception.pm rename to runtime/Perl5/t/classes/Test/ANTLR/Runtime/Exception.pm diff --git a/antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/Lexer.pm b/runtime/Perl5/t/classes/Test/ANTLR/Runtime/Lexer.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/classes/Test/ANTLR/Runtime/Lexer.pm rename to runtime/Perl5/t/classes/Test/ANTLR/Runtime/Lexer.pm diff --git a/antlr-3.4/runtime/Perl5/t/examples/expr.t b/runtime/Perl5/t/examples/expr.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/examples/expr.t rename to runtime/Perl5/t/examples/expr.t diff --git a/antlr-3.4/runtime/Perl5/t/examples/fig.t b/runtime/Perl5/t/examples/fig.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/examples/fig.t rename to runtime/Perl5/t/examples/fig.t diff --git a/antlr-3.4/runtime/Perl5/t/examples/simplecalc.t b/runtime/Perl5/t/examples/simplecalc.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/examples/simplecalc.t rename to runtime/Perl5/t/examples/simplecalc.t diff --git a/antlr-3.4/runtime/Perl5/t/lexer.t b/runtime/Perl5/t/lexer.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/lexer.t rename to runtime/Perl5/t/lexer.t diff --git a/antlr-3.4/runtime/Perl5/t/lib/ANTLR/Runtime/Test.pm b/runtime/Perl5/t/lib/ANTLR/Runtime/Test.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/lib/ANTLR/Runtime/Test.pm rename to runtime/Perl5/t/lib/ANTLR/Runtime/Test.pm diff --git a/antlr-3.4/runtime/Perl5/t/lib/My/Test/Class.pm b/runtime/Perl5/t/lib/My/Test/Class.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/lib/My/Test/Class.pm rename to runtime/Perl5/t/lib/My/Test/Class.pm diff --git a/antlr-3.4/runtime/Perl5/t/lib/My/Test/Class/Load.pm b/runtime/Perl5/t/lib/My/Test/Class/Load.pm similarity index 100% rename from antlr-3.4/runtime/Perl5/t/lib/My/Test/Class/Load.pm rename to runtime/Perl5/t/lib/My/Test/Class/Load.pm diff --git a/antlr-3.4/runtime/Perl5/t/version.t b/runtime/Perl5/t/version.t similarity index 100% rename from antlr-3.4/runtime/Perl5/t/version.t rename to runtime/Perl5/t/version.t diff --git a/antlr-3.4/runtime/Perl5/tools/antlr.bat b/runtime/Perl5/tools/antlr.bat similarity index 100% rename from antlr-3.4/runtime/Perl5/tools/antlr.bat rename to runtime/Perl5/tools/antlr.bat diff --git a/antlr-3.4/runtime/Perl5/tools/antlr.sh b/runtime/Perl5/tools/antlr.sh similarity index 100% rename from antlr-3.4/runtime/Perl5/tools/antlr.sh rename to runtime/Perl5/tools/antlr.sh diff --git a/antlr-3.4/runtime/Perl5/tools/port.pl b/runtime/Perl5/tools/port.pl similarity index 100% rename from antlr-3.4/runtime/Perl5/tools/port.pl rename to runtime/Perl5/tools/port.pl diff --git a/antlr-3.4/runtime/Python/AUTHORS b/runtime/Python/AUTHORS similarity index 100% rename from antlr-3.4/runtime/Python/AUTHORS rename to runtime/Python/AUTHORS diff --git a/antlr-3.4/runtime/Python/ChangeLog b/runtime/Python/ChangeLog similarity index 100% rename from antlr-3.4/runtime/Python/ChangeLog rename to runtime/Python/ChangeLog diff --git a/antlr-3.4/runtime/Python/LICENSE b/runtime/Python/LICENSE similarity index 100% rename from antlr-3.4/runtime/Python/LICENSE rename to runtime/Python/LICENSE diff --git a/antlr-3.4/runtime/Python/MANIFEST.in b/runtime/Python/MANIFEST.in similarity index 100% rename from antlr-3.4/runtime/Python/MANIFEST.in rename to runtime/Python/MANIFEST.in diff --git a/antlr-3.4/runtime/Python/README b/runtime/Python/README similarity index 100% rename from antlr-3.4/runtime/Python/README rename to runtime/Python/README diff --git a/antlr-3.4/runtime/Python/TODO b/runtime/Python/TODO similarity index 100% rename from antlr-3.4/runtime/Python/TODO rename to runtime/Python/TODO diff --git a/antlr-3.4/runtime/Python/antlr3/__init__.py b/runtime/Python/antlr3/__init__.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/__init__.py rename to runtime/Python/antlr3/__init__.py diff --git a/antlr-3.4/runtime/Python/antlr3/compat.py b/runtime/Python/antlr3/compat.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/compat.py rename to runtime/Python/antlr3/compat.py diff --git a/antlr-3.4/runtime/Python/antlr3/constants.py b/runtime/Python/antlr3/constants.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/constants.py rename to runtime/Python/antlr3/constants.py diff --git a/antlr-3.4/runtime/Python/antlr3/debug.py b/runtime/Python/antlr3/debug.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/debug.py rename to runtime/Python/antlr3/debug.py diff --git a/antlr-3.4/runtime/Python/antlr3/dfa.py b/runtime/Python/antlr3/dfa.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/dfa.py rename to runtime/Python/antlr3/dfa.py diff --git a/antlr-3.4/runtime/Python/antlr3/dottreegen.py b/runtime/Python/antlr3/dottreegen.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/dottreegen.py rename to runtime/Python/antlr3/dottreegen.py diff --git a/antlr-3.4/runtime/Python/antlr3/exceptions.py b/runtime/Python/antlr3/exceptions.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/exceptions.py rename to runtime/Python/antlr3/exceptions.py diff --git a/antlr-3.4/runtime/Python/antlr3/extras.py b/runtime/Python/antlr3/extras.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/extras.py rename to runtime/Python/antlr3/extras.py diff --git a/antlr-3.4/runtime/Python/antlr3/main.py b/runtime/Python/antlr3/main.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/main.py rename to runtime/Python/antlr3/main.py diff --git a/antlr-3.4/runtime/Python/antlr3/recognizers.py b/runtime/Python/antlr3/recognizers.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/recognizers.py rename to runtime/Python/antlr3/recognizers.py diff --git a/antlr-3.4/runtime/Python/antlr3/streams.py b/runtime/Python/antlr3/streams.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/streams.py rename to runtime/Python/antlr3/streams.py diff --git a/antlr-3.4/runtime/Python/antlr3/tokens.py b/runtime/Python/antlr3/tokens.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/tokens.py rename to runtime/Python/antlr3/tokens.py diff --git a/antlr-3.4/runtime/Python/antlr3/tree.py b/runtime/Python/antlr3/tree.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/tree.py rename to runtime/Python/antlr3/tree.py diff --git a/antlr-3.4/runtime/Python/antlr3/treewizard.py b/runtime/Python/antlr3/treewizard.py similarity index 100% rename from antlr-3.4/runtime/Python/antlr3/treewizard.py rename to runtime/Python/antlr3/treewizard.py diff --git a/antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4-py2.4.egg b/runtime/Python/dist/antlr_python_runtime-3.4-py2.4.egg similarity index 100% rename from antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4-py2.4.egg rename to runtime/Python/dist/antlr_python_runtime-3.4-py2.4.egg diff --git a/antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4-py2.6.egg b/runtime/Python/dist/antlr_python_runtime-3.4-py2.6.egg similarity index 100% rename from antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4-py2.6.egg rename to runtime/Python/dist/antlr_python_runtime-3.4-py2.6.egg diff --git a/antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4.tar.gz b/runtime/Python/dist/antlr_python_runtime-3.4.tar.gz similarity index 100% rename from antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4.tar.gz rename to runtime/Python/dist/antlr_python_runtime-3.4.tar.gz diff --git a/antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4.zip b/runtime/Python/dist/antlr_python_runtime-3.4.zip similarity index 100% rename from antlr-3.4/runtime/Python/dist/antlr_python_runtime-3.4.zip rename to runtime/Python/dist/antlr_python_runtime-3.4.zip diff --git a/antlr-3.4/runtime/Python/doxyfile b/runtime/Python/doxyfile similarity index 100% rename from antlr-3.4/runtime/Python/doxyfile rename to runtime/Python/doxyfile diff --git a/antlr-3.4/runtime/Python/ez_setup.py b/runtime/Python/ez_setup.py similarity index 100% rename from antlr-3.4/runtime/Python/ez_setup.py rename to runtime/Python/ez_setup.py diff --git a/antlr-3.4/runtime/Python/hudson-build.sh b/runtime/Python/hudson-build.sh similarity index 100% rename from antlr-3.4/runtime/Python/hudson-build.sh rename to runtime/Python/hudson-build.sh diff --git a/antlr-3.4/runtime/Python/mkdoxy.sh b/runtime/Python/mkdoxy.sh similarity index 100% rename from antlr-3.4/runtime/Python/mkdoxy.sh rename to runtime/Python/mkdoxy.sh diff --git a/antlr-3.4/runtime/Python/pylintrc b/runtime/Python/pylintrc similarity index 100% rename from antlr-3.4/runtime/Python/pylintrc rename to runtime/Python/pylintrc diff --git a/antlr-3.4/runtime/Python/setup.py b/runtime/Python/setup.py similarity index 100% rename from antlr-3.4/runtime/Python/setup.py rename to runtime/Python/setup.py diff --git a/antlr-3.4/runtime/Python/tests/t001lexer.g b/runtime/Python/tests/t001lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t001lexer.g rename to runtime/Python/tests/t001lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t001lexer.py b/runtime/Python/tests/t001lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t001lexer.py rename to runtime/Python/tests/t001lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t002lexer.g b/runtime/Python/tests/t002lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t002lexer.g rename to runtime/Python/tests/t002lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t002lexer.py b/runtime/Python/tests/t002lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t002lexer.py rename to runtime/Python/tests/t002lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t003lexer.g b/runtime/Python/tests/t003lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t003lexer.g rename to runtime/Python/tests/t003lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t003lexer.py b/runtime/Python/tests/t003lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t003lexer.py rename to runtime/Python/tests/t003lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t004lexer.g b/runtime/Python/tests/t004lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t004lexer.g rename to runtime/Python/tests/t004lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t004lexer.py b/runtime/Python/tests/t004lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t004lexer.py rename to runtime/Python/tests/t004lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t005lexer.g b/runtime/Python/tests/t005lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t005lexer.g rename to runtime/Python/tests/t005lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t005lexer.py b/runtime/Python/tests/t005lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t005lexer.py rename to runtime/Python/tests/t005lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t006lexer.g b/runtime/Python/tests/t006lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t006lexer.g rename to runtime/Python/tests/t006lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t006lexer.py b/runtime/Python/tests/t006lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t006lexer.py rename to runtime/Python/tests/t006lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t007lexer.g b/runtime/Python/tests/t007lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t007lexer.g rename to runtime/Python/tests/t007lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t007lexer.py b/runtime/Python/tests/t007lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t007lexer.py rename to runtime/Python/tests/t007lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t008lexer.g b/runtime/Python/tests/t008lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t008lexer.g rename to runtime/Python/tests/t008lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t008lexer.py b/runtime/Python/tests/t008lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t008lexer.py rename to runtime/Python/tests/t008lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t009lexer.g b/runtime/Python/tests/t009lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t009lexer.g rename to runtime/Python/tests/t009lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t009lexer.py b/runtime/Python/tests/t009lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t009lexer.py rename to runtime/Python/tests/t009lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t010lexer.g b/runtime/Python/tests/t010lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t010lexer.g rename to runtime/Python/tests/t010lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t010lexer.py b/runtime/Python/tests/t010lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t010lexer.py rename to runtime/Python/tests/t010lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t011lexer.g b/runtime/Python/tests/t011lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t011lexer.g rename to runtime/Python/tests/t011lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t011lexer.py b/runtime/Python/tests/t011lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t011lexer.py rename to runtime/Python/tests/t011lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t012lexerXML.input b/runtime/Python/tests/t012lexerXML.input similarity index 100% rename from antlr-3.4/runtime/Python/tests/t012lexerXML.input rename to runtime/Python/tests/t012lexerXML.input diff --git a/antlr-3.4/runtime/Python/tests/t012lexerXML.output b/runtime/Python/tests/t012lexerXML.output similarity index 100% rename from antlr-3.4/runtime/Python/tests/t012lexerXML.output rename to runtime/Python/tests/t012lexerXML.output diff --git a/antlr-3.4/runtime/Python/tests/t012lexerXML.py b/runtime/Python/tests/t012lexerXML.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t012lexerXML.py rename to runtime/Python/tests/t012lexerXML.py diff --git a/antlr-3.4/runtime/Python/tests/t012lexerXMLLexer.g b/runtime/Python/tests/t012lexerXMLLexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t012lexerXMLLexer.g rename to runtime/Python/tests/t012lexerXMLLexer.g diff --git a/antlr-3.4/runtime/Python/tests/t013parser.g b/runtime/Python/tests/t013parser.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t013parser.g rename to runtime/Python/tests/t013parser.g diff --git a/antlr-3.4/runtime/Python/tests/t013parser.py b/runtime/Python/tests/t013parser.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t013parser.py rename to runtime/Python/tests/t013parser.py diff --git a/antlr-3.4/runtime/Python/tests/t014parser.g b/runtime/Python/tests/t014parser.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t014parser.g rename to runtime/Python/tests/t014parser.g diff --git a/antlr-3.4/runtime/Python/tests/t014parser.py b/runtime/Python/tests/t014parser.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t014parser.py rename to runtime/Python/tests/t014parser.py diff --git a/antlr-3.4/runtime/Python/tests/t015calc.g b/runtime/Python/tests/t015calc.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t015calc.g rename to runtime/Python/tests/t015calc.g diff --git a/antlr-3.4/runtime/Python/tests/t015calc.py b/runtime/Python/tests/t015calc.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t015calc.py rename to runtime/Python/tests/t015calc.py diff --git a/antlr-3.4/runtime/Python/tests/t016actions.g b/runtime/Python/tests/t016actions.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t016actions.g rename to runtime/Python/tests/t016actions.g diff --git a/antlr-3.4/runtime/Python/tests/t016actions.py b/runtime/Python/tests/t016actions.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t016actions.py rename to runtime/Python/tests/t016actions.py diff --git a/antlr-3.4/runtime/Python/tests/t017parser.g b/runtime/Python/tests/t017parser.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t017parser.g rename to runtime/Python/tests/t017parser.g diff --git a/antlr-3.4/runtime/Python/tests/t017parser.py b/runtime/Python/tests/t017parser.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t017parser.py rename to runtime/Python/tests/t017parser.py diff --git a/antlr-3.4/runtime/Python/tests/t018llstar.g b/runtime/Python/tests/t018llstar.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t018llstar.g rename to runtime/Python/tests/t018llstar.g diff --git a/antlr-3.4/runtime/Python/tests/t018llstar.input b/runtime/Python/tests/t018llstar.input similarity index 100% rename from antlr-3.4/runtime/Python/tests/t018llstar.input rename to runtime/Python/tests/t018llstar.input diff --git a/antlr-3.4/runtime/Python/tests/t018llstar.output b/runtime/Python/tests/t018llstar.output similarity index 100% rename from antlr-3.4/runtime/Python/tests/t018llstar.output rename to runtime/Python/tests/t018llstar.output diff --git a/antlr-3.4/runtime/Python/tests/t018llstar.py b/runtime/Python/tests/t018llstar.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t018llstar.py rename to runtime/Python/tests/t018llstar.py diff --git a/antlr-3.4/runtime/Python/tests/t019lexer.g b/runtime/Python/tests/t019lexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t019lexer.g rename to runtime/Python/tests/t019lexer.g diff --git a/antlr-3.4/runtime/Python/tests/t019lexer.input b/runtime/Python/tests/t019lexer.input similarity index 100% rename from antlr-3.4/runtime/Python/tests/t019lexer.input rename to runtime/Python/tests/t019lexer.input diff --git a/antlr-3.4/runtime/Python/tests/t019lexer.py b/runtime/Python/tests/t019lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t019lexer.py rename to runtime/Python/tests/t019lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t020fuzzy.input b/runtime/Python/tests/t020fuzzy.input similarity index 100% rename from antlr-3.4/runtime/Python/tests/t020fuzzy.input rename to runtime/Python/tests/t020fuzzy.input diff --git a/antlr-3.4/runtime/Python/tests/t020fuzzy.output b/runtime/Python/tests/t020fuzzy.output similarity index 100% rename from antlr-3.4/runtime/Python/tests/t020fuzzy.output rename to runtime/Python/tests/t020fuzzy.output diff --git a/antlr-3.4/runtime/Python/tests/t020fuzzy.py b/runtime/Python/tests/t020fuzzy.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t020fuzzy.py rename to runtime/Python/tests/t020fuzzy.py diff --git a/antlr-3.4/runtime/Python/tests/t020fuzzyLexer.g b/runtime/Python/tests/t020fuzzyLexer.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t020fuzzyLexer.g rename to runtime/Python/tests/t020fuzzyLexer.g diff --git a/antlr-3.4/runtime/Python/tests/t021hoist.g b/runtime/Python/tests/t021hoist.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t021hoist.g rename to runtime/Python/tests/t021hoist.g diff --git a/antlr-3.4/runtime/Python/tests/t021hoist.py b/runtime/Python/tests/t021hoist.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t021hoist.py rename to runtime/Python/tests/t021hoist.py diff --git a/antlr-3.4/runtime/Python/tests/t022scopes.g b/runtime/Python/tests/t022scopes.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t022scopes.g rename to runtime/Python/tests/t022scopes.g diff --git a/antlr-3.4/runtime/Python/tests/t022scopes.py b/runtime/Python/tests/t022scopes.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t022scopes.py rename to runtime/Python/tests/t022scopes.py diff --git a/antlr-3.4/runtime/Python/tests/t023scopes.g b/runtime/Python/tests/t023scopes.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t023scopes.g rename to runtime/Python/tests/t023scopes.g diff --git a/antlr-3.4/runtime/Python/tests/t023scopes.py b/runtime/Python/tests/t023scopes.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t023scopes.py rename to runtime/Python/tests/t023scopes.py diff --git a/antlr-3.4/runtime/Python/tests/t024finally.g b/runtime/Python/tests/t024finally.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t024finally.g rename to runtime/Python/tests/t024finally.g diff --git a/antlr-3.4/runtime/Python/tests/t024finally.py b/runtime/Python/tests/t024finally.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t024finally.py rename to runtime/Python/tests/t024finally.py diff --git a/antlr-3.4/runtime/Python/tests/t025lexerRulePropertyRef.g b/runtime/Python/tests/t025lexerRulePropertyRef.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t025lexerRulePropertyRef.g rename to runtime/Python/tests/t025lexerRulePropertyRef.g diff --git a/antlr-3.4/runtime/Python/tests/t025lexerRulePropertyRef.py b/runtime/Python/tests/t025lexerRulePropertyRef.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t025lexerRulePropertyRef.py rename to runtime/Python/tests/t025lexerRulePropertyRef.py diff --git a/antlr-3.4/runtime/Python/tests/t026actions.g b/runtime/Python/tests/t026actions.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t026actions.g rename to runtime/Python/tests/t026actions.g diff --git a/antlr-3.4/runtime/Python/tests/t026actions.py b/runtime/Python/tests/t026actions.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t026actions.py rename to runtime/Python/tests/t026actions.py diff --git a/antlr-3.4/runtime/Python/tests/t027eof.g b/runtime/Python/tests/t027eof.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t027eof.g rename to runtime/Python/tests/t027eof.g diff --git a/antlr-3.4/runtime/Python/tests/t027eof.py b/runtime/Python/tests/t027eof.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t027eof.py rename to runtime/Python/tests/t027eof.py diff --git a/antlr-3.4/runtime/Python/tests/t028labelExpr.g.disabled b/runtime/Python/tests/t028labelExpr.g.disabled similarity index 100% rename from antlr-3.4/runtime/Python/tests/t028labelExpr.g.disabled rename to runtime/Python/tests/t028labelExpr.g.disabled diff --git a/antlr-3.4/runtime/Python/tests/t029synpredgate.g b/runtime/Python/tests/t029synpredgate.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t029synpredgate.g rename to runtime/Python/tests/t029synpredgate.g diff --git a/antlr-3.4/runtime/Python/tests/t029synpredgate.py b/runtime/Python/tests/t029synpredgate.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t029synpredgate.py rename to runtime/Python/tests/t029synpredgate.py diff --git a/antlr-3.4/runtime/Python/tests/t030specialStates.g b/runtime/Python/tests/t030specialStates.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t030specialStates.g rename to runtime/Python/tests/t030specialStates.g diff --git a/antlr-3.4/runtime/Python/tests/t030specialStates.py b/runtime/Python/tests/t030specialStates.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t030specialStates.py rename to runtime/Python/tests/t030specialStates.py diff --git a/antlr-3.4/runtime/Python/tests/t031emptyAlt.g b/runtime/Python/tests/t031emptyAlt.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t031emptyAlt.g rename to runtime/Python/tests/t031emptyAlt.g diff --git a/antlr-3.4/runtime/Python/tests/t031emptyAlt.py b/runtime/Python/tests/t031emptyAlt.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t031emptyAlt.py rename to runtime/Python/tests/t031emptyAlt.py diff --git a/antlr-3.4/runtime/Python/tests/t032subrulePredict.g b/runtime/Python/tests/t032subrulePredict.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t032subrulePredict.g rename to runtime/Python/tests/t032subrulePredict.g diff --git a/antlr-3.4/runtime/Python/tests/t032subrulePredict.py b/runtime/Python/tests/t032subrulePredict.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t032subrulePredict.py rename to runtime/Python/tests/t032subrulePredict.py diff --git a/antlr-3.4/runtime/Python/tests/t033backtracking.g b/runtime/Python/tests/t033backtracking.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t033backtracking.g rename to runtime/Python/tests/t033backtracking.g diff --git a/antlr-3.4/runtime/Python/tests/t033backtracking.py b/runtime/Python/tests/t033backtracking.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t033backtracking.py rename to runtime/Python/tests/t033backtracking.py diff --git a/antlr-3.4/runtime/Python/tests/t034tokenLabelPropertyRef.g b/runtime/Python/tests/t034tokenLabelPropertyRef.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t034tokenLabelPropertyRef.g rename to runtime/Python/tests/t034tokenLabelPropertyRef.g diff --git a/antlr-3.4/runtime/Python/tests/t034tokenLabelPropertyRef.py b/runtime/Python/tests/t034tokenLabelPropertyRef.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t034tokenLabelPropertyRef.py rename to runtime/Python/tests/t034tokenLabelPropertyRef.py diff --git a/antlr-3.4/runtime/Python/tests/t035ruleLabelPropertyRef.g b/runtime/Python/tests/t035ruleLabelPropertyRef.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t035ruleLabelPropertyRef.g rename to runtime/Python/tests/t035ruleLabelPropertyRef.g diff --git a/antlr-3.4/runtime/Python/tests/t035ruleLabelPropertyRef.py b/runtime/Python/tests/t035ruleLabelPropertyRef.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t035ruleLabelPropertyRef.py rename to runtime/Python/tests/t035ruleLabelPropertyRef.py diff --git a/antlr-3.4/runtime/Python/tests/t036multipleReturnValues.g b/runtime/Python/tests/t036multipleReturnValues.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t036multipleReturnValues.g rename to runtime/Python/tests/t036multipleReturnValues.g diff --git a/antlr-3.4/runtime/Python/tests/t036multipleReturnValues.py b/runtime/Python/tests/t036multipleReturnValues.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t036multipleReturnValues.py rename to runtime/Python/tests/t036multipleReturnValues.py diff --git a/antlr-3.4/runtime/Python/tests/t037rulePropertyRef.g b/runtime/Python/tests/t037rulePropertyRef.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t037rulePropertyRef.g rename to runtime/Python/tests/t037rulePropertyRef.g diff --git a/antlr-3.4/runtime/Python/tests/t037rulePropertyRef.py b/runtime/Python/tests/t037rulePropertyRef.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t037rulePropertyRef.py rename to runtime/Python/tests/t037rulePropertyRef.py diff --git a/antlr-3.4/runtime/Python/tests/t038lexerRuleLabel.g b/runtime/Python/tests/t038lexerRuleLabel.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t038lexerRuleLabel.g rename to runtime/Python/tests/t038lexerRuleLabel.g diff --git a/antlr-3.4/runtime/Python/tests/t038lexerRuleLabel.py b/runtime/Python/tests/t038lexerRuleLabel.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t038lexerRuleLabel.py rename to runtime/Python/tests/t038lexerRuleLabel.py diff --git a/antlr-3.4/runtime/Python/tests/t039labels.g b/runtime/Python/tests/t039labels.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t039labels.g rename to runtime/Python/tests/t039labels.g diff --git a/antlr-3.4/runtime/Python/tests/t039labels.py b/runtime/Python/tests/t039labels.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t039labels.py rename to runtime/Python/tests/t039labels.py diff --git a/antlr-3.4/runtime/Python/tests/t040bug80.g b/runtime/Python/tests/t040bug80.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t040bug80.g rename to runtime/Python/tests/t040bug80.g diff --git a/antlr-3.4/runtime/Python/tests/t040bug80.py b/runtime/Python/tests/t040bug80.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t040bug80.py rename to runtime/Python/tests/t040bug80.py diff --git a/antlr-3.4/runtime/Python/tests/t041parameters.g b/runtime/Python/tests/t041parameters.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t041parameters.g rename to runtime/Python/tests/t041parameters.g diff --git a/antlr-3.4/runtime/Python/tests/t041parameters.py b/runtime/Python/tests/t041parameters.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t041parameters.py rename to runtime/Python/tests/t041parameters.py diff --git a/antlr-3.4/runtime/Python/tests/t042ast.g b/runtime/Python/tests/t042ast.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t042ast.g rename to runtime/Python/tests/t042ast.g diff --git a/antlr-3.4/runtime/Python/tests/t042ast.py b/runtime/Python/tests/t042ast.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t042ast.py rename to runtime/Python/tests/t042ast.py diff --git a/antlr-3.4/runtime/Python/tests/t043synpred.g b/runtime/Python/tests/t043synpred.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t043synpred.g rename to runtime/Python/tests/t043synpred.g diff --git a/antlr-3.4/runtime/Python/tests/t043synpred.py b/runtime/Python/tests/t043synpred.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t043synpred.py rename to runtime/Python/tests/t043synpred.py diff --git a/antlr-3.4/runtime/Python/tests/t044trace.g b/runtime/Python/tests/t044trace.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t044trace.g rename to runtime/Python/tests/t044trace.g diff --git a/antlr-3.4/runtime/Python/tests/t044trace.py b/runtime/Python/tests/t044trace.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t044trace.py rename to runtime/Python/tests/t044trace.py diff --git a/antlr-3.4/runtime/Python/tests/t045dfabug.g b/runtime/Python/tests/t045dfabug.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t045dfabug.g rename to runtime/Python/tests/t045dfabug.g diff --git a/antlr-3.4/runtime/Python/tests/t045dfabug.py b/runtime/Python/tests/t045dfabug.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t045dfabug.py rename to runtime/Python/tests/t045dfabug.py diff --git a/antlr-3.4/runtime/Python/tests/t046rewrite.g b/runtime/Python/tests/t046rewrite.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t046rewrite.g rename to runtime/Python/tests/t046rewrite.g diff --git a/antlr-3.4/runtime/Python/tests/t046rewrite.py b/runtime/Python/tests/t046rewrite.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t046rewrite.py rename to runtime/Python/tests/t046rewrite.py diff --git a/antlr-3.4/runtime/Python/tests/t047treeparser.g b/runtime/Python/tests/t047treeparser.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t047treeparser.g rename to runtime/Python/tests/t047treeparser.g diff --git a/antlr-3.4/runtime/Python/tests/t047treeparser.py b/runtime/Python/tests/t047treeparser.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t047treeparser.py rename to runtime/Python/tests/t047treeparser.py diff --git a/antlr-3.4/runtime/Python/tests/t047treeparserWalker.g b/runtime/Python/tests/t047treeparserWalker.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t047treeparserWalker.g rename to runtime/Python/tests/t047treeparserWalker.g diff --git a/antlr-3.4/runtime/Python/tests/t048rewrite.g b/runtime/Python/tests/t048rewrite.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t048rewrite.g rename to runtime/Python/tests/t048rewrite.g diff --git a/antlr-3.4/runtime/Python/tests/t048rewrite.py b/runtime/Python/tests/t048rewrite.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t048rewrite.py rename to runtime/Python/tests/t048rewrite.py diff --git a/antlr-3.4/runtime/Python/tests/t048rewrite2.g b/runtime/Python/tests/t048rewrite2.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t048rewrite2.g rename to runtime/Python/tests/t048rewrite2.g diff --git a/antlr-3.4/runtime/Python/tests/t049treeparser.py b/runtime/Python/tests/t049treeparser.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t049treeparser.py rename to runtime/Python/tests/t049treeparser.py diff --git a/antlr-3.4/runtime/Python/tests/t050decorate.g b/runtime/Python/tests/t050decorate.g similarity index 100% rename from antlr-3.4/runtime/Python/tests/t050decorate.g rename to runtime/Python/tests/t050decorate.g diff --git a/antlr-3.4/runtime/Python/tests/t050decorate.py b/runtime/Python/tests/t050decorate.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t050decorate.py rename to runtime/Python/tests/t050decorate.py diff --git a/antlr-3.4/runtime/Python/tests/t051treeRewriteAST.py b/runtime/Python/tests/t051treeRewriteAST.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t051treeRewriteAST.py rename to runtime/Python/tests/t051treeRewriteAST.py diff --git a/antlr-3.4/runtime/Python/tests/t052import.py b/runtime/Python/tests/t052import.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t052import.py rename to runtime/Python/tests/t052import.py diff --git a/antlr-3.4/runtime/Python/tests/t053hetero.py b/runtime/Python/tests/t053hetero.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t053hetero.py rename to runtime/Python/tests/t053hetero.py diff --git a/antlr-3.4/runtime/Python/tests/t054main.py b/runtime/Python/tests/t054main.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t054main.py rename to runtime/Python/tests/t054main.py diff --git a/antlr-3.4/runtime/Python/tests/t055templates.py b/runtime/Python/tests/t055templates.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t055templates.py rename to runtime/Python/tests/t055templates.py diff --git a/antlr-3.4/runtime/Python/tests/t056lexer.py b/runtime/Python/tests/t056lexer.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t056lexer.py rename to runtime/Python/tests/t056lexer.py diff --git a/antlr-3.4/runtime/Python/tests/t057autoAST.py b/runtime/Python/tests/t057autoAST.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t057autoAST.py rename to runtime/Python/tests/t057autoAST.py diff --git a/antlr-3.4/runtime/Python/tests/t058rewriteAST.py b/runtime/Python/tests/t058rewriteAST.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t058rewriteAST.py rename to runtime/Python/tests/t058rewriteAST.py diff --git a/antlr-3.4/runtime/Python/tests/t059debug.py b/runtime/Python/tests/t059debug.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t059debug.py rename to runtime/Python/tests/t059debug.py diff --git a/antlr-3.4/runtime/Python/tests/t060leftrecursion.py b/runtime/Python/tests/t060leftrecursion.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/t060leftrecursion.py rename to runtime/Python/tests/t060leftrecursion.py diff --git a/antlr-3.4/runtime/Python/tests/testbase.py b/runtime/Python/tests/testbase.py similarity index 100% rename from antlr-3.4/runtime/Python/tests/testbase.py rename to runtime/Python/tests/testbase.py diff --git a/antlr-3.4/runtime/Python/unittests/testantlr3.py b/runtime/Python/unittests/testantlr3.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testantlr3.py rename to runtime/Python/unittests/testantlr3.py diff --git a/antlr-3.4/runtime/Python/unittests/testbase.py b/runtime/Python/unittests/testbase.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testbase.py rename to runtime/Python/unittests/testbase.py diff --git a/antlr-3.4/runtime/Python/unittests/testdfa.py b/runtime/Python/unittests/testdfa.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testdfa.py rename to runtime/Python/unittests/testdfa.py diff --git a/antlr-3.4/runtime/Python/unittests/testdottreegen.py b/runtime/Python/unittests/testdottreegen.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testdottreegen.py rename to runtime/Python/unittests/testdottreegen.py diff --git a/antlr-3.4/runtime/Python/unittests/testexceptions.py b/runtime/Python/unittests/testexceptions.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testexceptions.py rename to runtime/Python/unittests/testexceptions.py diff --git a/antlr-3.4/runtime/Python/unittests/testrecognizers.py b/runtime/Python/unittests/testrecognizers.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testrecognizers.py rename to runtime/Python/unittests/testrecognizers.py diff --git a/antlr-3.4/runtime/Python/unittests/teststreams.input1 b/runtime/Python/unittests/teststreams.input1 similarity index 100% rename from antlr-3.4/runtime/Python/unittests/teststreams.input1 rename to runtime/Python/unittests/teststreams.input1 diff --git a/antlr-3.4/runtime/Python/unittests/teststreams.input2 b/runtime/Python/unittests/teststreams.input2 similarity index 100% rename from antlr-3.4/runtime/Python/unittests/teststreams.input2 rename to runtime/Python/unittests/teststreams.input2 diff --git a/antlr-3.4/runtime/Python/unittests/teststreams.py b/runtime/Python/unittests/teststreams.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/teststreams.py rename to runtime/Python/unittests/teststreams.py diff --git a/antlr-3.4/runtime/Python/unittests/testtree.py b/runtime/Python/unittests/testtree.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testtree.py rename to runtime/Python/unittests/testtree.py diff --git a/antlr-3.4/runtime/Python/unittests/testtreewizard.py b/runtime/Python/unittests/testtreewizard.py similarity index 100% rename from antlr-3.4/runtime/Python/unittests/testtreewizard.py rename to runtime/Python/unittests/testtreewizard.py diff --git a/antlr-3.4/runtime/Python/xmlrunner.py b/runtime/Python/xmlrunner.py similarity index 100% rename from antlr-3.4/runtime/Python/xmlrunner.py rename to runtime/Python/xmlrunner.py diff --git a/antlr-3.4/runtime/Ruby/ANTLR-LICENSE.txt b/runtime/Ruby/ANTLR-LICENSE.txt similarity index 100% rename from antlr-3.4/runtime/Ruby/ANTLR-LICENSE.txt rename to runtime/Ruby/ANTLR-LICENSE.txt diff --git a/antlr-3.4/runtime/Ruby/History.txt b/runtime/Ruby/History.txt similarity index 100% rename from antlr-3.4/runtime/Ruby/History.txt rename to runtime/Ruby/History.txt diff --git a/antlr-3.4/runtime/Ruby/README.txt b/runtime/Ruby/README.txt similarity index 100% rename from antlr-3.4/runtime/Ruby/README.txt rename to runtime/Ruby/README.txt diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3.rb b/runtime/Ruby/lib/antlr3.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3.rb rename to runtime/Ruby/lib/antlr3.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/constants.rb b/runtime/Ruby/lib/antlr3/constants.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/constants.rb rename to runtime/Ruby/lib/antlr3/constants.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/debug.rb b/runtime/Ruby/lib/antlr3/debug.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/debug.rb rename to runtime/Ruby/lib/antlr3/debug.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/debug/event-hub.rb b/runtime/Ruby/lib/antlr3/debug/event-hub.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/debug/event-hub.rb rename to runtime/Ruby/lib/antlr3/debug/event-hub.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/debug/record-event-listener.rb b/runtime/Ruby/lib/antlr3/debug/record-event-listener.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/debug/record-event-listener.rb rename to runtime/Ruby/lib/antlr3/debug/record-event-listener.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/debug/rule-tracer.rb b/runtime/Ruby/lib/antlr3/debug/rule-tracer.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/debug/rule-tracer.rb rename to runtime/Ruby/lib/antlr3/debug/rule-tracer.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/debug/socket.rb b/runtime/Ruby/lib/antlr3/debug/socket.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/debug/socket.rb rename to runtime/Ruby/lib/antlr3/debug/socket.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/debug/trace-event-listener.rb b/runtime/Ruby/lib/antlr3/debug/trace-event-listener.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/debug/trace-event-listener.rb rename to runtime/Ruby/lib/antlr3/debug/trace-event-listener.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/dfa.rb b/runtime/Ruby/lib/antlr3/dfa.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/dfa.rb rename to runtime/Ruby/lib/antlr3/dfa.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/dot.rb b/runtime/Ruby/lib/antlr3/dot.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/dot.rb rename to runtime/Ruby/lib/antlr3/dot.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/error.rb b/runtime/Ruby/lib/antlr3/error.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/error.rb rename to runtime/Ruby/lib/antlr3/error.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/main.rb b/runtime/Ruby/lib/antlr3/main.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/main.rb rename to runtime/Ruby/lib/antlr3/main.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/modes/ast-builder.rb b/runtime/Ruby/lib/antlr3/modes/ast-builder.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/modes/ast-builder.rb rename to runtime/Ruby/lib/antlr3/modes/ast-builder.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/modes/filter.rb b/runtime/Ruby/lib/antlr3/modes/filter.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/modes/filter.rb rename to runtime/Ruby/lib/antlr3/modes/filter.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/profile.rb b/runtime/Ruby/lib/antlr3/profile.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/profile.rb rename to runtime/Ruby/lib/antlr3/profile.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/recognizers.rb b/runtime/Ruby/lib/antlr3/recognizers.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/recognizers.rb rename to runtime/Ruby/lib/antlr3/recognizers.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/streams.rb b/runtime/Ruby/lib/antlr3/streams.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/streams.rb rename to runtime/Ruby/lib/antlr3/streams.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/streams/interactive.rb b/runtime/Ruby/lib/antlr3/streams/interactive.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/streams/interactive.rb rename to runtime/Ruby/lib/antlr3/streams/interactive.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/streams/rewrite.rb b/runtime/Ruby/lib/antlr3/streams/rewrite.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/streams/rewrite.rb rename to runtime/Ruby/lib/antlr3/streams/rewrite.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/task.rb b/runtime/Ruby/lib/antlr3/task.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/task.rb rename to runtime/Ruby/lib/antlr3/task.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/template.rb b/runtime/Ruby/lib/antlr3/template.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/template.rb rename to runtime/Ruby/lib/antlr3/template.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/template/group-file-lexer.rb b/runtime/Ruby/lib/antlr3/template/group-file-lexer.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/template/group-file-lexer.rb rename to runtime/Ruby/lib/antlr3/template/group-file-lexer.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/template/group-file-parser.rb b/runtime/Ruby/lib/antlr3/template/group-file-parser.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/template/group-file-parser.rb rename to runtime/Ruby/lib/antlr3/template/group-file-parser.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/template/group-file.rb b/runtime/Ruby/lib/antlr3/template/group-file.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/template/group-file.rb rename to runtime/Ruby/lib/antlr3/template/group-file.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/template/parameter.rb b/runtime/Ruby/lib/antlr3/template/parameter.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/template/parameter.rb rename to runtime/Ruby/lib/antlr3/template/parameter.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/test/call-stack.rb b/runtime/Ruby/lib/antlr3/test/call-stack.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/test/call-stack.rb rename to runtime/Ruby/lib/antlr3/test/call-stack.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/test/core-extensions.rb b/runtime/Ruby/lib/antlr3/test/core-extensions.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/test/core-extensions.rb rename to runtime/Ruby/lib/antlr3/test/core-extensions.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/test/functional.rb b/runtime/Ruby/lib/antlr3/test/functional.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/test/functional.rb rename to runtime/Ruby/lib/antlr3/test/functional.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/test/grammar.rb b/runtime/Ruby/lib/antlr3/test/grammar.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/test/grammar.rb rename to runtime/Ruby/lib/antlr3/test/grammar.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/token.rb b/runtime/Ruby/lib/antlr3/token.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/token.rb rename to runtime/Ruby/lib/antlr3/token.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/tree.rb b/runtime/Ruby/lib/antlr3/tree.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/tree.rb rename to runtime/Ruby/lib/antlr3/tree.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/tree/debug.rb b/runtime/Ruby/lib/antlr3/tree/debug.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/tree/debug.rb rename to runtime/Ruby/lib/antlr3/tree/debug.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/tree/visitor.rb b/runtime/Ruby/lib/antlr3/tree/visitor.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/tree/visitor.rb rename to runtime/Ruby/lib/antlr3/tree/visitor.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/tree/wizard.rb b/runtime/Ruby/lib/antlr3/tree/wizard.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/tree/wizard.rb rename to runtime/Ruby/lib/antlr3/tree/wizard.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/util.rb b/runtime/Ruby/lib/antlr3/util.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/util.rb rename to runtime/Ruby/lib/antlr3/util.rb diff --git a/antlr-3.4/runtime/Ruby/lib/antlr3/version.rb b/runtime/Ruby/lib/antlr3/version.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/lib/antlr3/version.rb rename to runtime/Ruby/lib/antlr3/version.rb diff --git a/antlr-3.4/runtime/Ruby/rakefile b/runtime/Ruby/rakefile similarity index 100% rename from antlr-3.4/runtime/Ruby/rakefile rename to runtime/Ruby/rakefile diff --git a/antlr-3.4/runtime/Ruby/test/functional/ast-output/auto-ast.rb b/runtime/Ruby/test/functional/ast-output/auto-ast.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/ast-output/auto-ast.rb rename to runtime/Ruby/test/functional/ast-output/auto-ast.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/ast-output/construction.rb b/runtime/Ruby/test/functional/ast-output/construction.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/ast-output/construction.rb rename to runtime/Ruby/test/functional/ast-output/construction.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/ast-output/hetero-nodes.rb b/runtime/Ruby/test/functional/ast-output/hetero-nodes.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/ast-output/hetero-nodes.rb rename to runtime/Ruby/test/functional/ast-output/hetero-nodes.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/ast-output/rewrites.rb b/runtime/Ruby/test/functional/ast-output/rewrites.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/ast-output/rewrites.rb rename to runtime/Ruby/test/functional/ast-output/rewrites.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/ast-output/tree-rewrite.rb b/runtime/Ruby/test/functional/ast-output/tree-rewrite.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/ast-output/tree-rewrite.rb rename to runtime/Ruby/test/functional/ast-output/tree-rewrite.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/debugging/debug-mode.rb b/runtime/Ruby/test/functional/debugging/debug-mode.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/debugging/debug-mode.rb rename to runtime/Ruby/test/functional/debugging/debug-mode.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/debugging/profile-mode.rb b/runtime/Ruby/test/functional/debugging/profile-mode.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/debugging/profile-mode.rb rename to runtime/Ruby/test/functional/debugging/profile-mode.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/debugging/rule-tracing.rb b/runtime/Ruby/test/functional/debugging/rule-tracing.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/debugging/rule-tracing.rb rename to runtime/Ruby/test/functional/debugging/rule-tracing.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/delegation/import.rb b/runtime/Ruby/test/functional/delegation/import.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/delegation/import.rb rename to runtime/Ruby/test/functional/delegation/import.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/lexer/basic.rb b/runtime/Ruby/test/functional/lexer/basic.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/lexer/basic.rb rename to runtime/Ruby/test/functional/lexer/basic.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/lexer/filter-mode.rb b/runtime/Ruby/test/functional/lexer/filter-mode.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/lexer/filter-mode.rb rename to runtime/Ruby/test/functional/lexer/filter-mode.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/lexer/nuances.rb b/runtime/Ruby/test/functional/lexer/nuances.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/lexer/nuances.rb rename to runtime/Ruby/test/functional/lexer/nuances.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/lexer/properties.rb b/runtime/Ruby/test/functional/lexer/properties.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/lexer/properties.rb rename to runtime/Ruby/test/functional/lexer/properties.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/lexer/syn-pred.rb b/runtime/Ruby/test/functional/lexer/syn-pred.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/lexer/syn-pred.rb rename to runtime/Ruby/test/functional/lexer/syn-pred.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/lexer/xml.rb b/runtime/Ruby/test/functional/lexer/xml.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/lexer/xml.rb rename to runtime/Ruby/test/functional/lexer/xml.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/main/main-scripts.rb b/runtime/Ruby/test/functional/main/main-scripts.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/main/main-scripts.rb rename to runtime/Ruby/test/functional/main/main-scripts.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/actions.rb b/runtime/Ruby/test/functional/parser/actions.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/actions.rb rename to runtime/Ruby/test/functional/parser/actions.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/backtracking.rb b/runtime/Ruby/test/functional/parser/backtracking.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/backtracking.rb rename to runtime/Ruby/test/functional/parser/backtracking.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/basic.rb b/runtime/Ruby/test/functional/parser/basic.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/basic.rb rename to runtime/Ruby/test/functional/parser/basic.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/calc.rb b/runtime/Ruby/test/functional/parser/calc.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/calc.rb rename to runtime/Ruby/test/functional/parser/calc.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/ll-star.rb b/runtime/Ruby/test/functional/parser/ll-star.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/ll-star.rb rename to runtime/Ruby/test/functional/parser/ll-star.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/nuances.rb b/runtime/Ruby/test/functional/parser/nuances.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/nuances.rb rename to runtime/Ruby/test/functional/parser/nuances.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/predicates.rb b/runtime/Ruby/test/functional/parser/predicates.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/predicates.rb rename to runtime/Ruby/test/functional/parser/predicates.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/properties.rb b/runtime/Ruby/test/functional/parser/properties.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/properties.rb rename to runtime/Ruby/test/functional/parser/properties.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/rule-methods.rb b/runtime/Ruby/test/functional/parser/rule-methods.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/rule-methods.rb rename to runtime/Ruby/test/functional/parser/rule-methods.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/parser/scopes.rb b/runtime/Ruby/test/functional/parser/scopes.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/parser/scopes.rb rename to runtime/Ruby/test/functional/parser/scopes.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/template-output/template-output.rb b/runtime/Ruby/test/functional/template-output/template-output.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/template-output/template-output.rb rename to runtime/Ruby/test/functional/template-output/template-output.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/token-rewrite/basic.rb b/runtime/Ruby/test/functional/token-rewrite/basic.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/token-rewrite/basic.rb rename to runtime/Ruby/test/functional/token-rewrite/basic.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/token-rewrite/via-parser.rb b/runtime/Ruby/test/functional/token-rewrite/via-parser.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/token-rewrite/via-parser.rb rename to runtime/Ruby/test/functional/token-rewrite/via-parser.rb diff --git a/antlr-3.4/runtime/Ruby/test/functional/tree-parser/basic.rb b/runtime/Ruby/test/functional/tree-parser/basic.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/functional/tree-parser/basic.rb rename to runtime/Ruby/test/functional/tree-parser/basic.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/sample-input/file-stream-1 b/runtime/Ruby/test/unit/sample-input/file-stream-1 similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/sample-input/file-stream-1 rename to runtime/Ruby/test/unit/sample-input/file-stream-1 diff --git a/antlr-3.4/runtime/Ruby/test/unit/sample-input/template-group b/runtime/Ruby/test/unit/sample-input/template-group similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/sample-input/template-group rename to runtime/Ruby/test/unit/sample-input/template-group diff --git a/antlr-3.4/runtime/Ruby/test/unit/sample-input/teststreams.input2 b/runtime/Ruby/test/unit/sample-input/teststreams.input2 similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/sample-input/teststreams.input2 rename to runtime/Ruby/test/unit/sample-input/teststreams.input2 diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-dfa.rb b/runtime/Ruby/test/unit/test-dfa.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-dfa.rb rename to runtime/Ruby/test/unit/test-dfa.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-exceptions.rb b/runtime/Ruby/test/unit/test-exceptions.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-exceptions.rb rename to runtime/Ruby/test/unit/test-exceptions.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-recognizers.rb b/runtime/Ruby/test/unit/test-recognizers.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-recognizers.rb rename to runtime/Ruby/test/unit/test-recognizers.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-scheme.rb b/runtime/Ruby/test/unit/test-scheme.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-scheme.rb rename to runtime/Ruby/test/unit/test-scheme.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-scope.rb b/runtime/Ruby/test/unit/test-scope.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-scope.rb rename to runtime/Ruby/test/unit/test-scope.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-streams.rb b/runtime/Ruby/test/unit/test-streams.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-streams.rb rename to runtime/Ruby/test/unit/test-streams.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-template.rb b/runtime/Ruby/test/unit/test-template.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-template.rb rename to runtime/Ruby/test/unit/test-template.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-tree-wizard.rb b/runtime/Ruby/test/unit/test-tree-wizard.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-tree-wizard.rb rename to runtime/Ruby/test/unit/test-tree-wizard.rb diff --git a/antlr-3.4/runtime/Ruby/test/unit/test-trees.rb b/runtime/Ruby/test/unit/test-trees.rb similarity index 100% rename from antlr-3.4/runtime/Ruby/test/unit/test-trees.rb rename to runtime/Ruby/test/unit/test-trees.rb diff --git a/antlr-3.4/tool/CHANGES.txt b/tool/CHANGES.txt similarity index 100% rename from antlr-3.4/tool/CHANGES.txt rename to tool/CHANGES.txt diff --git a/antlr-3.4/tool/LICENSE.txt b/tool/LICENSE.txt similarity index 100% rename from antlr-3.4/tool/LICENSE.txt rename to tool/LICENSE.txt diff --git a/antlr-3.4/tool/README.txt b/tool/README.txt similarity index 100% rename from antlr-3.4/tool/README.txt rename to tool/README.txt diff --git a/antlr-3.4/tool/antlr.config b/tool/antlr.config similarity index 100% rename from antlr-3.4/tool/antlr.config rename to tool/antlr.config diff --git a/antlr-3.4/tool/pom.xml b/tool/pom.xml similarity index 100% rename from antlr-3.4/tool/pom.xml rename to tool/pom.xml diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLR.g b/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLR.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLR.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/ANTLR.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRTreePrinter.g b/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRTreePrinter.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRTreePrinter.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRTreePrinter.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3.g b/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Tree.g b/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Tree.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Tree.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Tree.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ActionAnalysis.g b/tool/src/main/antlr3/org/antlr/grammar/v3/ActionAnalysis.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ActionAnalysis.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/ActionAnalysis.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ActionTranslator.g b/tool/src/main/antlr3/org/antlr/grammar/v3/ActionTranslator.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/ActionTranslator.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/ActionTranslator.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/AssignTokenTypesWalker.g b/tool/src/main/antlr3/org/antlr/grammar/v3/AssignTokenTypesWalker.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/AssignTokenTypesWalker.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/AssignTokenTypesWalker.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g b/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g b/tool/src/main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/LeftRecursiveRuleWalker.g b/tool/src/main/antlr3/org/antlr/grammar/v3/LeftRecursiveRuleWalker.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/LeftRecursiveRuleWalker.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/LeftRecursiveRuleWalker.g diff --git a/antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/TreeToNFAConverter.g b/tool/src/main/antlr3/org/antlr/grammar/v3/TreeToNFAConverter.g similarity index 100% rename from antlr-3.4/tool/src/main/antlr3/org/antlr/grammar/v3/TreeToNFAConverter.g rename to tool/src/main/antlr3/org/antlr/grammar/v3/TreeToNFAConverter.g diff --git a/antlr-3.4/tool/src/main/java/org/antlr/Tool.java b/tool/src/main/java/org/antlr/Tool.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/Tool.java rename to tool/src/main/java/org/antlr/Tool.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/ActionLabel.java b/tool/src/main/java/org/antlr/analysis/ActionLabel.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/ActionLabel.java rename to tool/src/main/java/org/antlr/analysis/ActionLabel.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/AnalysisRecursionOverflowException.java b/tool/src/main/java/org/antlr/analysis/AnalysisRecursionOverflowException.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/AnalysisRecursionOverflowException.java rename to tool/src/main/java/org/antlr/analysis/AnalysisRecursionOverflowException.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/AnalysisTimeoutException.java b/tool/src/main/java/org/antlr/analysis/AnalysisTimeoutException.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/AnalysisTimeoutException.java rename to tool/src/main/java/org/antlr/analysis/AnalysisTimeoutException.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/DFA.java b/tool/src/main/java/org/antlr/analysis/DFA.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/DFA.java rename to tool/src/main/java/org/antlr/analysis/DFA.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/DFAOptimizer.java b/tool/src/main/java/org/antlr/analysis/DFAOptimizer.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/DFAOptimizer.java rename to tool/src/main/java/org/antlr/analysis/DFAOptimizer.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/DFAState.java b/tool/src/main/java/org/antlr/analysis/DFAState.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/DFAState.java rename to tool/src/main/java/org/antlr/analysis/DFAState.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/DecisionProbe.java b/tool/src/main/java/org/antlr/analysis/DecisionProbe.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/DecisionProbe.java rename to tool/src/main/java/org/antlr/analysis/DecisionProbe.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/LL1Analyzer.java b/tool/src/main/java/org/antlr/analysis/LL1Analyzer.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/LL1Analyzer.java rename to tool/src/main/java/org/antlr/analysis/LL1Analyzer.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/LL1DFA.java b/tool/src/main/java/org/antlr/analysis/LL1DFA.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/LL1DFA.java rename to tool/src/main/java/org/antlr/analysis/LL1DFA.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/Label.java b/tool/src/main/java/org/antlr/analysis/Label.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/Label.java rename to tool/src/main/java/org/antlr/analysis/Label.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/LookaheadSet.java b/tool/src/main/java/org/antlr/analysis/LookaheadSet.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/LookaheadSet.java rename to tool/src/main/java/org/antlr/analysis/LookaheadSet.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/MachineProbe.java b/tool/src/main/java/org/antlr/analysis/MachineProbe.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/MachineProbe.java rename to tool/src/main/java/org/antlr/analysis/MachineProbe.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NFA.java b/tool/src/main/java/org/antlr/analysis/NFA.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NFA.java rename to tool/src/main/java/org/antlr/analysis/NFA.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAConfiguration.java b/tool/src/main/java/org/antlr/analysis/NFAConfiguration.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAConfiguration.java rename to tool/src/main/java/org/antlr/analysis/NFAConfiguration.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAContext.java b/tool/src/main/java/org/antlr/analysis/NFAContext.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAContext.java rename to tool/src/main/java/org/antlr/analysis/NFAContext.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAConversionThread.java b/tool/src/main/java/org/antlr/analysis/NFAConversionThread.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAConversionThread.java rename to tool/src/main/java/org/antlr/analysis/NFAConversionThread.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAState.java b/tool/src/main/java/org/antlr/analysis/NFAState.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAState.java rename to tool/src/main/java/org/antlr/analysis/NFAState.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAToDFAConverter.java b/tool/src/main/java/org/antlr/analysis/NFAToDFAConverter.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NFAToDFAConverter.java rename to tool/src/main/java/org/antlr/analysis/NFAToDFAConverter.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/NonLLStarDecisionException.java b/tool/src/main/java/org/antlr/analysis/NonLLStarDecisionException.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/NonLLStarDecisionException.java rename to tool/src/main/java/org/antlr/analysis/NonLLStarDecisionException.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/PredicateLabel.java b/tool/src/main/java/org/antlr/analysis/PredicateLabel.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/PredicateLabel.java rename to tool/src/main/java/org/antlr/analysis/PredicateLabel.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/RuleClosureTransition.java b/tool/src/main/java/org/antlr/analysis/RuleClosureTransition.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/RuleClosureTransition.java rename to tool/src/main/java/org/antlr/analysis/RuleClosureTransition.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/SemanticContext.java b/tool/src/main/java/org/antlr/analysis/SemanticContext.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/SemanticContext.java rename to tool/src/main/java/org/antlr/analysis/SemanticContext.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/State.java b/tool/src/main/java/org/antlr/analysis/State.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/State.java rename to tool/src/main/java/org/antlr/analysis/State.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/StateCluster.java b/tool/src/main/java/org/antlr/analysis/StateCluster.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/StateCluster.java rename to tool/src/main/java/org/antlr/analysis/StateCluster.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/analysis/Transition.java b/tool/src/main/java/org/antlr/analysis/Transition.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/analysis/Transition.java rename to tool/src/main/java/org/antlr/analysis/Transition.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/ACyclicDFACodeGenerator.java b/tool/src/main/java/org/antlr/codegen/ACyclicDFACodeGenerator.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/ACyclicDFACodeGenerator.java rename to tool/src/main/java/org/antlr/codegen/ACyclicDFACodeGenerator.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/ActionScriptTarget.java b/tool/src/main/java/org/antlr/codegen/ActionScriptTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/ActionScriptTarget.java rename to tool/src/main/java/org/antlr/codegen/ActionScriptTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/CPPTarget.java b/tool/src/main/java/org/antlr/codegen/CPPTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/CPPTarget.java rename to tool/src/main/java/org/antlr/codegen/CPPTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/CSharp2Target.java b/tool/src/main/java/org/antlr/codegen/CSharp2Target.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/CSharp2Target.java rename to tool/src/main/java/org/antlr/codegen/CSharp2Target.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/CSharp3Target.java b/tool/src/main/java/org/antlr/codegen/CSharp3Target.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/CSharp3Target.java rename to tool/src/main/java/org/antlr/codegen/CSharp3Target.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/CTarget.java b/tool/src/main/java/org/antlr/codegen/CTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/CTarget.java rename to tool/src/main/java/org/antlr/codegen/CTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/CodeGenerator.java b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/CodeGenerator.java rename to tool/src/main/java/org/antlr/codegen/CodeGenerator.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/DelphiTarget.java b/tool/src/main/java/org/antlr/codegen/DelphiTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/DelphiTarget.java rename to tool/src/main/java/org/antlr/codegen/DelphiTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/JavaScriptTarget.java b/tool/src/main/java/org/antlr/codegen/JavaScriptTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/JavaScriptTarget.java rename to tool/src/main/java/org/antlr/codegen/JavaScriptTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/JavaTarget.java b/tool/src/main/java/org/antlr/codegen/JavaTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/JavaTarget.java rename to tool/src/main/java/org/antlr/codegen/JavaTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/ObjCTarget.java b/tool/src/main/java/org/antlr/codegen/ObjCTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/ObjCTarget.java rename to tool/src/main/java/org/antlr/codegen/ObjCTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/Perl5Target.java b/tool/src/main/java/org/antlr/codegen/Perl5Target.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/Perl5Target.java rename to tool/src/main/java/org/antlr/codegen/Perl5Target.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/PythonTarget.java b/tool/src/main/java/org/antlr/codegen/PythonTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/PythonTarget.java rename to tool/src/main/java/org/antlr/codegen/PythonTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/RubyTarget.java b/tool/src/main/java/org/antlr/codegen/RubyTarget.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/RubyTarget.java rename to tool/src/main/java/org/antlr/codegen/RubyTarget.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/codegen/Target.java b/tool/src/main/java/org/antlr/codegen/Target.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/codegen/Target.java rename to tool/src/main/java/org/antlr/codegen/Target.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/Barrier.java b/tool/src/main/java/org/antlr/misc/Barrier.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/Barrier.java rename to tool/src/main/java/org/antlr/misc/Barrier.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/BitSet.java b/tool/src/main/java/org/antlr/misc/BitSet.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/BitSet.java rename to tool/src/main/java/org/antlr/misc/BitSet.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/Graph.java b/tool/src/main/java/org/antlr/misc/Graph.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/Graph.java rename to tool/src/main/java/org/antlr/misc/Graph.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/IntArrayList.java b/tool/src/main/java/org/antlr/misc/IntArrayList.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/IntArrayList.java rename to tool/src/main/java/org/antlr/misc/IntArrayList.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/IntSet.java b/tool/src/main/java/org/antlr/misc/IntSet.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/IntSet.java rename to tool/src/main/java/org/antlr/misc/IntSet.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/Interval.java b/tool/src/main/java/org/antlr/misc/Interval.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/Interval.java rename to tool/src/main/java/org/antlr/misc/Interval.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/IntervalSet.java b/tool/src/main/java/org/antlr/misc/IntervalSet.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/IntervalSet.java rename to tool/src/main/java/org/antlr/misc/IntervalSet.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/MultiMap.java b/tool/src/main/java/org/antlr/misc/MultiMap.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/MultiMap.java rename to tool/src/main/java/org/antlr/misc/MultiMap.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/MutableInteger.java b/tool/src/main/java/org/antlr/misc/MutableInteger.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/MutableInteger.java rename to tool/src/main/java/org/antlr/misc/MutableInteger.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/OrderedHashSet.java b/tool/src/main/java/org/antlr/misc/OrderedHashSet.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/OrderedHashSet.java rename to tool/src/main/java/org/antlr/misc/OrderedHashSet.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/misc/Utils.java b/tool/src/main/java/org/antlr/misc/Utils.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/misc/Utils.java rename to tool/src/main/java/org/antlr/misc/Utils.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/ANTLRErrorListener.java b/tool/src/main/java/org/antlr/tool/ANTLRErrorListener.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/ANTLRErrorListener.java rename to tool/src/main/java/org/antlr/tool/ANTLRErrorListener.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/AssignTokenTypesBehavior.java b/tool/src/main/java/org/antlr/tool/AssignTokenTypesBehavior.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/AssignTokenTypesBehavior.java rename to tool/src/main/java/org/antlr/tool/AssignTokenTypesBehavior.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Attribute.java b/tool/src/main/java/org/antlr/tool/Attribute.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Attribute.java rename to tool/src/main/java/org/antlr/tool/Attribute.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/AttributeScope.java b/tool/src/main/java/org/antlr/tool/AttributeScope.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/AttributeScope.java rename to tool/src/main/java/org/antlr/tool/AttributeScope.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/BuildDependencyGenerator.java b/tool/src/main/java/org/antlr/tool/BuildDependencyGenerator.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/BuildDependencyGenerator.java rename to tool/src/main/java/org/antlr/tool/BuildDependencyGenerator.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/CompositeGrammar.java rename to tool/src/main/java/org/antlr/tool/CompositeGrammar.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/CompositeGrammarTree.java b/tool/src/main/java/org/antlr/tool/CompositeGrammarTree.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/CompositeGrammarTree.java rename to tool/src/main/java/org/antlr/tool/CompositeGrammarTree.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/DOTGenerator.java b/tool/src/main/java/org/antlr/tool/DOTGenerator.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/DOTGenerator.java rename to tool/src/main/java/org/antlr/tool/DOTGenerator.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/ErrorManager.java b/tool/src/main/java/org/antlr/tool/ErrorManager.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/ErrorManager.java rename to tool/src/main/java/org/antlr/tool/ErrorManager.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/FASerializer.java b/tool/src/main/java/org/antlr/tool/FASerializer.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/FASerializer.java rename to tool/src/main/java/org/antlr/tool/FASerializer.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Grammar.java b/tool/src/main/java/org/antlr/tool/Grammar.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Grammar.java rename to tool/src/main/java/org/antlr/tool/Grammar.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarAST.java b/tool/src/main/java/org/antlr/tool/GrammarAST.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarAST.java rename to tool/src/main/java/org/antlr/tool/GrammarAST.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarAnalysisAbortedMessage.java b/tool/src/main/java/org/antlr/tool/GrammarAnalysisAbortedMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarAnalysisAbortedMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarAnalysisAbortedMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarDanglingStateMessage.java b/tool/src/main/java/org/antlr/tool/GrammarDanglingStateMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarDanglingStateMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarDanglingStateMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarInsufficientPredicatesMessage.java b/tool/src/main/java/org/antlr/tool/GrammarInsufficientPredicatesMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarInsufficientPredicatesMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarInsufficientPredicatesMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarNonDeterminismMessage.java b/tool/src/main/java/org/antlr/tool/GrammarNonDeterminismMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarNonDeterminismMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarNonDeterminismMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarReport.java b/tool/src/main/java/org/antlr/tool/GrammarReport.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarReport.java rename to tool/src/main/java/org/antlr/tool/GrammarReport.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarReport2.java b/tool/src/main/java/org/antlr/tool/GrammarReport2.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarReport2.java rename to tool/src/main/java/org/antlr/tool/GrammarReport2.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSanity.java b/tool/src/main/java/org/antlr/tool/GrammarSanity.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSanity.java rename to tool/src/main/java/org/antlr/tool/GrammarSanity.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSemanticsMessage.java b/tool/src/main/java/org/antlr/tool/GrammarSemanticsMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSemanticsMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarSemanticsMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSerializerFoo.java b/tool/src/main/java/org/antlr/tool/GrammarSerializerFoo.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSerializerFoo.java rename to tool/src/main/java/org/antlr/tool/GrammarSerializerFoo.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSpelunker.java b/tool/src/main/java/org/antlr/tool/GrammarSpelunker.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSpelunker.java rename to tool/src/main/java/org/antlr/tool/GrammarSpelunker.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSyntaxMessage.java b/tool/src/main/java/org/antlr/tool/GrammarSyntaxMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarSyntaxMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarSyntaxMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarUnreachableAltsMessage.java b/tool/src/main/java/org/antlr/tool/GrammarUnreachableAltsMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/GrammarUnreachableAltsMessage.java rename to tool/src/main/java/org/antlr/tool/GrammarUnreachableAltsMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Interp.java b/tool/src/main/java/org/antlr/tool/Interp.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Interp.java rename to tool/src/main/java/org/antlr/tool/Interp.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Interpreter.java b/tool/src/main/java/org/antlr/tool/Interpreter.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Interpreter.java rename to tool/src/main/java/org/antlr/tool/Interpreter.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/LeftRecursionCyclesMessage.java b/tool/src/main/java/org/antlr/tool/LeftRecursionCyclesMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/LeftRecursionCyclesMessage.java rename to tool/src/main/java/org/antlr/tool/LeftRecursionCyclesMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java b/tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java rename to tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Message.java b/tool/src/main/java/org/antlr/tool/Message.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Message.java rename to tool/src/main/java/org/antlr/tool/Message.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/NFAFactory.java b/tool/src/main/java/org/antlr/tool/NFAFactory.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/NFAFactory.java rename to tool/src/main/java/org/antlr/tool/NFAFactory.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/NameSpaceChecker.java b/tool/src/main/java/org/antlr/tool/NameSpaceChecker.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/NameSpaceChecker.java rename to tool/src/main/java/org/antlr/tool/NameSpaceChecker.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/NonRegularDecisionMessage.java b/tool/src/main/java/org/antlr/tool/NonRegularDecisionMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/NonRegularDecisionMessage.java rename to tool/src/main/java/org/antlr/tool/NonRegularDecisionMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/RandomPhrase.java b/tool/src/main/java/org/antlr/tool/RandomPhrase.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/RandomPhrase.java rename to tool/src/main/java/org/antlr/tool/RandomPhrase.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/RecursionOverflowMessage.java b/tool/src/main/java/org/antlr/tool/RecursionOverflowMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/RecursionOverflowMessage.java rename to tool/src/main/java/org/antlr/tool/RecursionOverflowMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Rule.java b/tool/src/main/java/org/antlr/tool/Rule.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Rule.java rename to tool/src/main/java/org/antlr/tool/Rule.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/RuleLabelScope.java b/tool/src/main/java/org/antlr/tool/RuleLabelScope.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/RuleLabelScope.java rename to tool/src/main/java/org/antlr/tool/RuleLabelScope.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/Strip.java b/tool/src/main/java/org/antlr/tool/Strip.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/Strip.java rename to tool/src/main/java/org/antlr/tool/Strip.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/ToolMessage.java b/tool/src/main/java/org/antlr/tool/ToolMessage.java similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/ToolMessage.java rename to tool/src/main/java/org/antlr/tool/ToolMessage.java diff --git a/antlr-3.4/tool/src/main/java/org/antlr/tool/serialize.g b/tool/src/main/java/org/antlr/tool/serialize.g similarity index 100% rename from antlr-3.4/tool/src/main/java/org/antlr/tool/serialize.g rename to tool/src/main/java/org/antlr/tool/serialize.g diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/antlr.properties b/tool/src/main/resources/org/antlr/antlr.properties similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/antlr.properties rename to tool/src/main/resources/org/antlr/antlr.properties diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ActionScript/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ActionScript.stg b/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ActionScript.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ActionScript.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ActionScript.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/C/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/C/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/C/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/C/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/C/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/C/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/C.stg b/tool/src/main/resources/org/antlr/codegen/templates/C/C.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/C.stg rename to tool/src/main/resources/org/antlr/codegen/templates/C/C.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/C/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/C/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/C/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CPP/CPP.stg b/tool/src/main/resources/org/antlr/codegen/templates/CPP/CPP.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CPP/CPP.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CPP/CPP.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/CSharp2.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/CSharp2.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/CSharp2.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/CSharp2.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ST.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/CSharp3.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/CSharp3.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/CSharp3.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/CSharp3.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ST.stg b/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Delphi/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Delphi/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/Delphi.stg b/tool/src/main/resources/org/antlr/codegen/templates/Delphi/Delphi.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Delphi/Delphi.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Delphi/Delphi.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/Java.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/Java.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/Java.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/Java.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/JavaScript/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/JavaScript.stg b/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/JavaScript.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/JavaScript.stg rename to tool/src/main/resources/org/antlr/codegen/templates/JavaScript/JavaScript.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/LeftRecursiveRules.stg b/tool/src/main/resources/org/antlr/codegen/templates/LeftRecursiveRules.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/LeftRecursiveRules.stg rename to tool/src/main/resources/org/antlr/codegen/templates/LeftRecursiveRules.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ObjC.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ObjC.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ObjC.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/ObjC.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST4ObjC.stg b/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST4ObjC.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST4ObjC.stg rename to tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST4ObjC.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Perl5/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Perl5/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Perl5/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Perl5/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Perl5/Perl5.stg b/tool/src/main/resources/org/antlr/codegen/templates/Perl5/Perl5.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Perl5/Perl5.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Perl5/Perl5.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/ST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Python/ST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Python/ST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/AST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/AST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/AST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/AST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTDbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTDbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTDbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTDbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTTreeParser.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTTreeParser.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTTreeParser.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTTreeParser.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Dbg.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Dbg.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Dbg.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/Dbg.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Ruby.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Ruby.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Ruby.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/Ruby.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ST.stg b/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ST.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ST.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Ruby/ST.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Scala/Scala.stg b/tool/src/main/resources/org/antlr/codegen/templates/Scala/Scala.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/codegen/templates/Scala/Scala.stg rename to tool/src/main/resources/org/antlr/codegen/templates/Scala/Scala.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/depend.stg b/tool/src/main/resources/org/antlr/tool/templates/depend.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/depend.stg rename to tool/src/main/resources/org/antlr/tool/templates/depend.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/action-edge.st b/tool/src/main/resources/org/antlr/tool/templates/dot/action-edge.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/action-edge.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/action-edge.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/decision-rank.st b/tool/src/main/resources/org/antlr/tool/templates/dot/decision-rank.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/decision-rank.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/decision-rank.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/dfa.st b/tool/src/main/resources/org/antlr/tool/templates/dot/dfa.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/dfa.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/dfa.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/dot.stg b/tool/src/main/resources/org/antlr/tool/templates/dot/dot.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/dot.stg rename to tool/src/main/resources/org/antlr/tool/templates/dot/dot.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/edge.st b/tool/src/main/resources/org/antlr/tool/templates/dot/edge.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/edge.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/edge.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/epsilon-edge.st b/tool/src/main/resources/org/antlr/tool/templates/dot/epsilon-edge.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/epsilon-edge.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/epsilon-edge.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/nfa.st b/tool/src/main/resources/org/antlr/tool/templates/dot/nfa.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/nfa.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/nfa.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/state.st b/tool/src/main/resources/org/antlr/tool/templates/dot/state.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/state.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/state.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/stopstate.st b/tool/src/main/resources/org/antlr/tool/templates/dot/stopstate.st similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/dot/stopstate.st rename to tool/src/main/resources/org/antlr/tool/templates/dot/stopstate.st diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/formats/antlr.stg b/tool/src/main/resources/org/antlr/tool/templates/messages/formats/antlr.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/formats/antlr.stg rename to tool/src/main/resources/org/antlr/tool/templates/messages/formats/antlr.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/formats/gnu.stg b/tool/src/main/resources/org/antlr/tool/templates/messages/formats/gnu.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/formats/gnu.stg rename to tool/src/main/resources/org/antlr/tool/templates/messages/formats/gnu.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/formats/vs2005.stg b/tool/src/main/resources/org/antlr/tool/templates/messages/formats/vs2005.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/formats/vs2005.stg rename to tool/src/main/resources/org/antlr/tool/templates/messages/formats/vs2005.stg diff --git a/antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/languages/en.stg b/tool/src/main/resources/org/antlr/tool/templates/messages/languages/en.stg similarity index 100% rename from antlr-3.4/tool/src/main/resources/org/antlr/tool/templates/messages/languages/en.stg rename to tool/src/main/resources/org/antlr/tool/templates/messages/languages/en.stg diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/BaseTest.java b/tool/src/test/java/org/antlr/test/BaseTest.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/BaseTest.java rename to tool/src/test/java/org/antlr/test/BaseTest.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/DebugTestAutoAST.java b/tool/src/test/java/org/antlr/test/DebugTestAutoAST.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/DebugTestAutoAST.java rename to tool/src/test/java/org/antlr/test/DebugTestAutoAST.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/DebugTestCompositeGrammars.java b/tool/src/test/java/org/antlr/test/DebugTestCompositeGrammars.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/DebugTestCompositeGrammars.java rename to tool/src/test/java/org/antlr/test/DebugTestCompositeGrammars.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/DebugTestRewriteAST.java b/tool/src/test/java/org/antlr/test/DebugTestRewriteAST.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/DebugTestRewriteAST.java rename to tool/src/test/java/org/antlr/test/DebugTestRewriteAST.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/ErrorQueue.java b/tool/src/test/java/org/antlr/test/ErrorQueue.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/ErrorQueue.java rename to tool/src/test/java/org/antlr/test/ErrorQueue.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestASTConstruction.java b/tool/src/test/java/org/antlr/test/TestASTConstruction.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestASTConstruction.java rename to tool/src/test/java/org/antlr/test/TestASTConstruction.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestAttributes.java b/tool/src/test/java/org/antlr/test/TestAttributes.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestAttributes.java rename to tool/src/test/java/org/antlr/test/TestAttributes.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestAutoAST.java b/tool/src/test/java/org/antlr/test/TestAutoAST.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestAutoAST.java rename to tool/src/test/java/org/antlr/test/TestAutoAST.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestBufferedTreeNodeStream.java b/tool/src/test/java/org/antlr/test/TestBufferedTreeNodeStream.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestBufferedTreeNodeStream.java rename to tool/src/test/java/org/antlr/test/TestBufferedTreeNodeStream.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java b/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java rename to tool/src/test/java/org/antlr/test/TestCharDFAConversion.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestCommonTokenStream.java b/tool/src/test/java/org/antlr/test/TestCommonTokenStream.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestCommonTokenStream.java rename to tool/src/test/java/org/antlr/test/TestCommonTokenStream.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestCompositeGrammars.java b/tool/src/test/java/org/antlr/test/TestCompositeGrammars.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestCompositeGrammars.java rename to tool/src/test/java/org/antlr/test/TestCompositeGrammars.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestDFAConversion.java b/tool/src/test/java/org/antlr/test/TestDFAConversion.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestDFAConversion.java rename to tool/src/test/java/org/antlr/test/TestDFAConversion.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestDFAMatching.java b/tool/src/test/java/org/antlr/test/TestDFAMatching.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestDFAMatching.java rename to tool/src/test/java/org/antlr/test/TestDFAMatching.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestFastQueue.java b/tool/src/test/java/org/antlr/test/TestFastQueue.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestFastQueue.java rename to tool/src/test/java/org/antlr/test/TestFastQueue.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestHeteroAST.java b/tool/src/test/java/org/antlr/test/TestHeteroAST.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestHeteroAST.java rename to tool/src/test/java/org/antlr/test/TestHeteroAST.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestInterpretedLexing.java b/tool/src/test/java/org/antlr/test/TestInterpretedLexing.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestInterpretedLexing.java rename to tool/src/test/java/org/antlr/test/TestInterpretedLexing.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestInterpretedParsing.java b/tool/src/test/java/org/antlr/test/TestInterpretedParsing.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestInterpretedParsing.java rename to tool/src/test/java/org/antlr/test/TestInterpretedParsing.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestIntervalSet.java b/tool/src/test/java/org/antlr/test/TestIntervalSet.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestIntervalSet.java rename to tool/src/test/java/org/antlr/test/TestIntervalSet.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestJavaCodeGeneration.java b/tool/src/test/java/org/antlr/test/TestJavaCodeGeneration.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestJavaCodeGeneration.java rename to tool/src/test/java/org/antlr/test/TestJavaCodeGeneration.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestLeftRecursion.java b/tool/src/test/java/org/antlr/test/TestLeftRecursion.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestLeftRecursion.java rename to tool/src/test/java/org/antlr/test/TestLeftRecursion.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestLexer.java b/tool/src/test/java/org/antlr/test/TestLexer.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestLexer.java rename to tool/src/test/java/org/antlr/test/TestLexer.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestMessages.java b/tool/src/test/java/org/antlr/test/TestMessages.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestMessages.java rename to tool/src/test/java/org/antlr/test/TestMessages.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestNFAConstruction.java b/tool/src/test/java/org/antlr/test/TestNFAConstruction.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestNFAConstruction.java rename to tool/src/test/java/org/antlr/test/TestNFAConstruction.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestRewriteAST.java b/tool/src/test/java/org/antlr/test/TestRewriteAST.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestRewriteAST.java rename to tool/src/test/java/org/antlr/test/TestRewriteAST.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestRewriteTemplates.java b/tool/src/test/java/org/antlr/test/TestRewriteTemplates.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestRewriteTemplates.java rename to tool/src/test/java/org/antlr/test/TestRewriteTemplates.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java b/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java rename to tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java rename to tool/src/test/java/org/antlr/test/TestSemanticPredicates.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestSets.java b/tool/src/test/java/org/antlr/test/TestSets.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestSets.java rename to tool/src/test/java/org/antlr/test/TestSets.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestSymbolDefinitions.java b/tool/src/test/java/org/antlr/test/TestSymbolDefinitions.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestSymbolDefinitions.java rename to tool/src/test/java/org/antlr/test/TestSymbolDefinitions.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java b/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java rename to tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestSyntaxErrors.java b/tool/src/test/java/org/antlr/test/TestSyntaxErrors.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestSyntaxErrors.java rename to tool/src/test/java/org/antlr/test/TestSyntaxErrors.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTemplates.java b/tool/src/test/java/org/antlr/test/TestTemplates.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTemplates.java rename to tool/src/test/java/org/antlr/test/TestTemplates.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTokenRewriteStream.java b/tool/src/test/java/org/antlr/test/TestTokenRewriteStream.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTokenRewriteStream.java rename to tool/src/test/java/org/antlr/test/TestTokenRewriteStream.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTopologicalSort.java b/tool/src/test/java/org/antlr/test/TestTopologicalSort.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTopologicalSort.java rename to tool/src/test/java/org/antlr/test/TestTopologicalSort.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeGrammarRewriteAST.java b/tool/src/test/java/org/antlr/test/TestTreeGrammarRewriteAST.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeGrammarRewriteAST.java rename to tool/src/test/java/org/antlr/test/TestTreeGrammarRewriteAST.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeIterator.java b/tool/src/test/java/org/antlr/test/TestTreeIterator.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeIterator.java rename to tool/src/test/java/org/antlr/test/TestTreeIterator.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeNodeStream.java b/tool/src/test/java/org/antlr/test/TestTreeNodeStream.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeNodeStream.java rename to tool/src/test/java/org/antlr/test/TestTreeNodeStream.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeParsing.java b/tool/src/test/java/org/antlr/test/TestTreeParsing.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeParsing.java rename to tool/src/test/java/org/antlr/test/TestTreeParsing.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeWizard.java b/tool/src/test/java/org/antlr/test/TestTreeWizard.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTreeWizard.java rename to tool/src/test/java/org/antlr/test/TestTreeWizard.java diff --git a/antlr-3.4/tool/src/test/java/org/antlr/test/TestTrees.java b/tool/src/test/java/org/antlr/test/TestTrees.java similarity index 100% rename from antlr-3.4/tool/src/test/java/org/antlr/test/TestTrees.java rename to tool/src/test/java/org/antlr/test/TestTrees.java