[groovy2] 01/03: Reverting previous merge of invalid tarball
komal sukhani
komal-guest at moszumanska.debian.org
Thu Jun 25 20:37:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
komal-guest pushed a commit to branch master
in repository groovy2.
commit 81d408208ea322403cfd248adc3af4370b3acbf3
Author: komal <komaldsukhani at gmail.com>
Date: Thu Jun 25 23:47:22 2015 +0530
Reverting previous merge of invalid tarball
This reverts commit ec29b1253a7045ebb63812a16a1c77e697086e1a, reversing
changes made to ecbd2b32711472fb3e3022da059a7f3517f70e0a.
---
groovy/upstream/groovy-2.4.3/LICENSE => LICENSE | 0
groovy/upstream/groovy-2.4.3/NOTICE => NOTICE | 0
.../groovy-2.4.3/README.adoc => README.adoc | 0
.../benchmark => benchmark}/bench.groovy | 0
.../benchmark => benchmark}/bench/LICENSE | 0
.../benchmark => benchmark}/bench/ackermann.groovy | 0
.../benchmark => benchmark}/bench/ackermann.java | 0
.../benchmark => benchmark}/bench/ackermann.output | 0
.../benchmark => benchmark}/bench/ary.groovy | 0
.../benchmark => benchmark}/bench/ary.java | 0
.../benchmark => benchmark}/bench/ary.output | 0
.../bench/binarytrees.groovy | 0
.../benchmark => benchmark}/bench/binarytrees.java | 0
.../benchmark => benchmark}/bench/chameneos.java | 0
.../benchmark => benchmark}/bench/echo.java | 0
.../benchmark => benchmark}/bench/echo.ouput | 0
.../benchmark => benchmark}/bench/except.java | 0
.../benchmark => benchmark}/bench/except.output | 0
.../benchmark => benchmark}/bench/fannkuch.groovy | 0
.../benchmark => benchmark}/bench/fannkuch.java | 0
.../bench/fannkuchredux.java | 0
.../benchmark => benchmark}/bench/fasta.java | 0
.../benchmark => benchmark}/bench/fibo.groovy | 0
.../benchmark => benchmark}/bench/fibo.java | 0
.../benchmark => benchmark}/bench/fibo.output | 0
.../benchmark => benchmark}/bench/harmonic.java | 0
.../benchmark => benchmark}/bench/hash.java | 0
.../benchmark => benchmark}/bench/hash.output | 0
.../benchmark => benchmark}/bench/hash2.java | 0
.../benchmark => benchmark}/bench/hash2.output | 0
.../benchmark => benchmark}/bench/heapsort.groovy | 0
.../benchmark => benchmark}/bench/heapsort.java | 0
.../benchmark => benchmark}/bench/heapsort.output | 0
.../benchmark => benchmark}/bench/hello.groovy | 0
.../benchmark => benchmark}/bench/hello.java | 0
.../benchmark => benchmark}/bench/hello.output | 0
.../benchmark => benchmark}/bench/knucleotide.java | 0
.../benchmark => benchmark}/bench/lists.java | 0
.../benchmark => benchmark}/bench/lists.output | 0
.../bench/magicsquares.java | 0
.../bench/mandelbrot.groovy | 0
.../benchmark => benchmark}/bench/mandelbrot.java | 0
.../benchmark => benchmark}/bench/matrix.java | 0
.../benchmark => benchmark}/bench/matrix.output | 0
.../benchmark => benchmark}/bench/message.java | 0
.../benchmark => benchmark}/bench/meteor.java | 0
.../benchmark => benchmark}/bench/methcall.java | 0
.../benchmark => benchmark}/bench/moments.java | 0
.../benchmark => benchmark}/bench/moments.output | 0
.../benchmark => benchmark}/bench/nbody.java | 0
.../benchmark => benchmark}/bench/nestedloop.java | 0
.../bench/nestedloop.output | 0
.../benchmark => benchmark}/bench/nsieve.groovy | 0
.../benchmark => benchmark}/bench/nsieve.java | 0
.../benchmark => benchmark}/bench/nsievebits.java | 0
.../benchmark => benchmark}/bench/objinst.java | 0
.../benchmark => benchmark}/bench/objinst.output | 0
.../benchmark => benchmark}/bench/partialsums.java | 0
.../benchmark => benchmark}/bench/pidigits.java | 0
.../benchmark => benchmark}/bench/process.java | 0
.../benchmark => benchmark}/bench/prodcons.java | 0
.../benchmark => benchmark}/bench/random.groovy | 0
.../benchmark => benchmark}/bench/random.java | 0
.../benchmark => benchmark}/bench/raytracer.java | 0
.../benchmark => benchmark}/bench/recursive.groovy | 0
.../benchmark => benchmark}/bench/recursive.java | 0
.../benchmark => benchmark}/bench/regexdna.groovy | 0
.../benchmark => benchmark}/bench/regexdna.java | 0
.../benchmark => benchmark}/bench/revcomp.groovy | 0
.../benchmark => benchmark}/bench/revcomp.java | 0
.../benchmark => benchmark}/bench/sieve.java | 0
.../benchmark => benchmark}/bench/sieve.output | 0
.../bench/spectralnorm.groovy | 0
.../bench/spectralnorm.java | 0
.../benchmark => benchmark}/bench/spellcheck.java | 0
.../bench/spellcheck.output | 0
.../benchmark => benchmark}/bench/strcat.java | 0
.../benchmark => benchmark}/bench/strcat.output | 0
.../benchmark => benchmark}/bench/sumcol.java | 0
.../benchmark => benchmark}/bench/sumcol.output | 0
.../benchmark => benchmark}/bench/takfp.java | 0
.../bench/threadring.groovy | 0
.../benchmark => benchmark}/bench/threadring.java | 0
.../benchmark => benchmark}/bench/wc.java | 0
.../benchmark => benchmark}/bench/wc.output | 0
.../benchmark => benchmark}/bench/wordfreq.groovy | 0
.../benchmark => benchmark}/bench/wordfreq.java | 0
.../groovy-2.4.3/build.gradle => build.gradle | 0
.../buildSrc => buildSrc}/build.gradle | 0
.../gradle/WriteExtensionDescriptorTask.groovy | 0
buildSrc/src/main/java/JavadocFixTool.java | 350 ++++++
.../binarycompatibility/binarycompat-report.groovy | 0
.../config => config}/bnd/groovy-all.bnd | 0
.../groovy-2.4.3/config => config}/bnd/groovy.bnd | 0
.../config => config}/build/ANTLR-LICENSE.txt | 0
.../config => config}/build/ASM-LICENSE.txt | 0
.../config => config}/build/JSR223-LICENSE.txt | 0
.../checkstyle/checkstyle-report.groovy | 0
.../config => config}/checkstyle/checkstyle.xml | 0
.../config => config}/checkstyle/codeHeader.txt | 0
.../config => config}/codenarc/codenarc.groovy | 0
.../gradle.properties => gradle.properties | 0
.../groovy-2.4.3/gradle => gradle}/LICENSE.txt | 0
.../gradle => gradle}/asciidoctor.gradle | 0
.../groovy-2.4.3/gradle => gradle}/assemble.gradle | 0
.../gradle => gradle}/backports.gradle | 0
.../gradle => gradle}/binarycompatibility.gradle | 0
.../groovy-2.4.3/gradle => gradle}/bintray.gradle | 0
.../groovy-2.4.3/gradle => gradle}/codehaus.gradle | 0
.../groovy-2.4.3/gradle => gradle}/docs.gradle | 0
.../groovy-2.4.3/gradle => gradle}/eclipse.gradle | 0
.../groovy-2.4.3/gradle => gradle}/filter.gradle | 0
.../gradle => gradle}/groovydoc.gradle | 0
.../groovy-2.4.3/gradle => gradle}/idea.gradle | 0
.../groovy-2.4.3/gradle => gradle}/indy.gradle | 0
.../gradle => gradle}/jacoco/jacoco.gradle | 0
.../gradle => gradle}/jacoco/jacocofix.gradle | 0
.../gradle => gradle}/pomconfigurer.gradle | 0
.../groovy-2.4.3/gradle => gradle}/quality.gradle | 0
.../groovy-2.4.3/gradle => gradle}/test.gradle | 0
.../groovy-2.4.3/gradle => gradle}/upload.gradle | 0
.../groovy-2.4.3/gradle => gradle}/utils.gradle | 0
.../wrapper/gradle-wrapper.properties | 0
groovy/upstream/groovy-2.4.3/gradlew => gradlew | 0
.../groovy-2.4.3/gradlew.bat => gradlew.bat | 0
.../security => security}/groovy.policy | 0
.../groovy-2.4.3/security => security}/groovykeys | Bin
.../settings.gradle => settings.gradle | 0
.../upstream/groovy-2.4.3/src => src}/bin/grape | 0
.../groovy-2.4.3/src => src}/bin/grape.bat | 0
.../upstream/groovy-2.4.3/src => src}/bin/groovy | 0
.../groovy-2.4.3/src => src}/bin/groovy.bat | 0
.../groovy-2.4.3/src => src}/bin/groovy.icns | Bin
.../groovy-2.4.3/src => src}/bin/groovyConsole | 0
.../groovy-2.4.3/src => src}/bin/groovyConsole.bat | 0
.../upstream/groovy-2.4.3/src => src}/bin/groovyc | 0
.../groovy-2.4.3/src => src}/bin/groovyc.bat | 0
.../groovy-2.4.3/src => src}/bin/groovydoc | 0
.../groovy-2.4.3/src => src}/bin/groovydoc.bat | 0
.../upstream/groovy-2.4.3/src => src}/bin/groovysh | 0
.../groovy-2.4.3/src => src}/bin/groovysh.bat | 0
.../groovy-2.4.3/src => src}/bin/java2groovy | 0
.../groovy-2.4.3/src => src}/bin/java2groovy.bat | 0
.../groovy-2.4.3/src => src}/bin/startGroovy | 0
.../groovy-2.4.3/src => src}/bin/startGroovy.bat | 0
.../src => src}/conf/groovy-starter.conf | 0
.../src => src}/examples/astbuilder/Main.groovy | 0
.../examples/astbuilder/MainExample.groovy | 0
.../examples/astbuilder/MainIntegrationTest.groovy | 0
.../examples/astbuilder/MainTransformation.groovy | 0
.../src => src}/examples/astbuilder/build.xml | 0
.../src => src}/examples/astbuilder/readme.txt | 0
.../examples/commandLineTools/AntMap.groovy | 0
.../examples/commandLineTools/BigTests.groovy | 0
.../examples/commandLineTools/ListFiles.groovy | 0
.../examples/commandLineTools/Reflections.groovy | 0
.../commandLineTools/SimpleWebServer.groovy | 0
.../examples/console/MortgageCalculator.groovy | 0
.../examples/console/knowYourTables.groovy | 0
.../examples/console/thinkOfANumber.groovy | 0
.../examples/groovy/j2ee/CreateData.groovy | 0
.../examples/groovy/j2ee/J2eeConsole.java | 0
.../examples/groovy/model/MvcDemo.groovy | 0
.../src => src}/examples/groovy/swing/Demo.java | 0
.../examples/groovy/swing/MyTableModel.java | 0
.../examples/groovy/swing/SwingDemo.groovy | 0
.../examples/groovy/swing/TableDemo.groovy | 0
.../examples/groovy/swing/TableLayoutDemo.groovy | 0
.../examples/groovy2d/paintingByNumbers.groovy | 0
.../examples/groovyShell/ArithmeticShell.groovy | 0
.../groovyShell/ArithmeticShellTest.groovy | 0
.../examples/groovyShell/BlacklistingShell.groovy | 0
.../groovyShell/BlacklistingShellTest.groovy | 0
.../DefaultGrailsDomainClassInjector.java | 0
.../grails/compiler/injection/DomainClass.java | 0
.../src => src}/examples/osgi/build.properties | 0
.../src => src}/examples/osgi/build.xml | 0
.../org/codehaus/groovy/osgi/Activator.groovy | 0
.../org/codehaus/groovy/osgi/GroovyGreeter.groovy | 0
.../codehaus/groovy/osgi/GroovyGreeterImpl.groovy | 0
.../groovy/osgi/harness/HarnessActivator.groovy | 0
.../src => src}/examples/osgi/readme.txt | 0
.../examples/searchEngine/Indexer.groovy | 0
.../examples/searchEngine/Searcher.groovy | 0
.../examples/swing/BindingExample.groovy | 0
.../examples/swing/BloglinesClient.groovy | 0
.../examples/swing/ModelNodeExample.groovy | 0
.../src => src}/examples/swing/RegexCoach.groovy | 0
.../examples/swing/RegexCoachController.groovy | 0
.../examples/swing/RegexCoachView.groovy | 0
.../src => src}/examples/swing/Widgets.groovy | 0
.../swing/binding/caricature/Caricature.groovy | 0
.../swing/binding/caricature/JCaricature.java | 0
.../swing/binding/caricature/resources/eyes1.gif | Bin
.../swing/binding/caricature/resources/eyes2.gif | Bin
.../swing/binding/caricature/resources/eyes3.gif | Bin
.../swing/binding/caricature/resources/eyes4.gif | Bin
.../swing/binding/caricature/resources/eyes5.gif | Bin
.../swing/binding/caricature/resources/face1.gif | Bin
.../swing/binding/caricature/resources/face2.gif | Bin
.../swing/binding/caricature/resources/face3.gif | Bin
.../swing/binding/caricature/resources/face4.gif | Bin
.../swing/binding/caricature/resources/face5.gif | Bin
.../swing/binding/caricature/resources/glasses.gif | Bin
.../binding/caricature/resources/glassesWEyes.gif | Bin
.../swing/binding/caricature/resources/hair1.gif | Bin
.../swing/binding/caricature/resources/hair2.gif | Bin
.../swing/binding/caricature/resources/hair3.gif | Bin
.../swing/binding/caricature/resources/hair4.gif | Bin
.../swing/binding/caricature/resources/hair5.gif | Bin
.../swing/binding/caricature/resources/mouth1.gif | Bin
.../swing/binding/caricature/resources/mouth2.gif | Bin
.../swing/binding/caricature/resources/mouth3.gif | Bin
.../swing/binding/caricature/resources/mouth4.gif | Bin
.../swing/binding/caricature/resources/mouth5.gif | Bin
.../swing/binding/caricature/resources/nose1.gif | Bin
.../swing/binding/caricature/resources/nose2.gif | Bin
.../swing/binding/caricature/resources/nose3.gif | Bin
.../swing/binding/caricature/resources/nose4.gif | Bin
.../swing/binding/caricature/resources/nose5.gif | Bin
.../src => src}/examples/swing/greet/Greet.groovy | 0
.../examples/swing/greet/TwitterAPI.groovy | 0
.../src => src}/examples/swing/greet/View.groovy | 0
.../examples/swing/timelog/TimeLogMain.groovy | 0
.../examples/swing/timelog/TimeLogModel.groovy | 0
.../examples/swing/timelog/TimeLogView.groovy | 0
.../global/CompiledAtASTTransformation.groovy | 0
.../transforms/global/CompiledAtExample.groovy | 0
.../global/CompiledAtIntegrationTest.groovy | 0
.../global/LoggingASTTransformation.groovy | 0
.../transforms/global/LoggingExample.groovy | 0
...org.codehaus.groovy.transform.ASTTransformation | 0
.../examples/transforms/global/build.xml | 0
.../examples/transforms/global/readme.txt | 0
.../local/LoggingASTTransformation.groovy | 0
.../transforms/local/LoggingExample.groovy | 0
.../examples/transforms/local/WithLogging.groovy | 0
.../examples/transforms/local/build.xml | 0
.../examples/transforms/local/readme.txt | 0
.../groovlet-examples/WEB-INF/groovy/Animal.groovy | 0
.../WEB-INF/groovy/zoo/Fish.groovy | 0
.../WEB-INF/groovy/zoo/fish/Shark.groovy | 0
.../WEB-INF/groovy/zoo/fish/Trout.groovy | 0
.../webapps/groovlet-examples/WEB-INF/web.xml | 0
.../webapps/groovlet-examples/codehaus-style.css | 0
.../webapps/groovlet-examples/hello/hello.groovy | 0
.../webapps/groovlet-examples/images/code.gif | Bin
.../webapps/groovlet-examples/images/execute.gif | Bin
.../webapps/groovlet-examples/images/groovy.png | Bin
.../webapps/groovlet-examples/images/return.gif | Bin
.../webapps/groovlet-examples/index.groovy | 0
.../examples/webapps/groovlet-examples/readme.txt | 0
.../webapps/groovlet-examples/xml/index.xhtml | 0
.../zoo/HommingbergerGepardenforelle.groovy | 0
.../webapps/groovlet-examples/zoo/visit.groovy | 0
.../webapps/groovlet-examples/zoo/zoo.groovy | 0
.../examples/webapps/gsp-examples/readme.txt | 0
.../template-examples/3.times.HelloWorld.html | 0
.../WEB-INF/lib/groovy-all-xyz.jar.placeholder | 0
.../webapps/template-examples/WEB-INF/web.xml | 0
.../template-examples/javasystemproperties.htm | 0
.../examples/webapps/template-examples/readme.txt | 0
.../groovy-2.4.3/src => src}/latex/ref/README.txt | 0
.../latex/ref/groovy-reference-card.tex | 0
.../src => src}/latex/ref/one-groovy-logo.eps | 0
.../src => src}/latex/ref/one-groovy-logo.mps | 0
.../src => src}/latex/spec/colophon.tex | 0
.../src => src}/latex/spec/expressions.tex | 0
.../src => src}/latex/spec/groovy-lang-spec.tex | 0
.../src => src}/latex/spec/keywords.tex | 0
.../src => src}/latex/spec/operators.tex | 0
.../src => src}/latex/spec/preface.tex | 0
.../src => src}/latex/spec/statements.tex | 0
.../main/META-INF/groovy-release-info.properties | 0
.../services/org.codehaus.groovy.source.Extensions | 0
...org.codehaus.groovy.transform.ASTTransformation | 0
.../src => src}/main/groovy/beans/Bindable.java | 0
.../groovy/beans/BindableASTTransformation.java | 0
.../main/groovy/beans/DefaultPropertyAccessor.java | 0
.../main/groovy/beans/DefaultPropertyReader.java | 0
.../main/groovy/beans/DefaultPropertyWriter.java | 0
.../main/groovy/beans/ListenerList.groovy | 0
.../beans/ListenerListASTTransformation.groovy | 0
.../main/groovy/beans/PropertyAccessor.java | 0
.../main/groovy/beans/PropertyReader.java | 0
.../main/groovy/beans/PropertyWriter.java | 0
.../src => src}/main/groovy/beans/Vetoable.java | 0
.../groovy/beans/VetoableASTTransformation.java | 0
.../groovy/grape/GrabAnnotationTransformation.java | 0
.../src => src}/main/groovy/grape/Grape.java | 0
.../src => src}/main/groovy/grape/GrapeEngine.java | 0
.../src => src}/main/groovy/grape/GrapeIvy.groovy | 0
.../src => src}/main/groovy/inspect/Inspector.java | 0
.../src => src}/main/groovy/inspect/package.html | 0
.../groovy/io/EncodingAwareBufferedWriter.java | 0
.../src => src}/main/groovy/io/FileType.java | 0
.../main/groovy/io/FileVisitResult.java | 0
.../main/groovy/io/GroovyPrintStream.java | 0
.../main/groovy/io/GroovyPrintWriter.java | 0
.../main/groovy/io/LineColumnReader.java | 0
.../main/groovy/io/PlatformLineWriter.java | 0
.../src => src}/main/groovy/io/package.html | 0
.../main/groovy/lang/AdaptingMetaClass.java | 0
.../main/groovy/lang/BenchmarkInterceptor.java | 0
.../src => src}/main/groovy/lang/Binding.java | 0
.../src => src}/main/groovy/lang/Buildable.java | 0
.../src => src}/main/groovy/lang/Category.java | 0
.../src => src}/main/groovy/lang/Closure.java | 0
.../main/groovy/lang/ClosureException.java | 0
.../main/groovy/lang/ClosureInvokingMethod.java | 0
.../src => src}/main/groovy/lang/Delegate.java | 0
.../src => src}/main/groovy/lang/DelegatesTo.java | 0
.../main/groovy/lang/DelegatingMetaClass.java | 0
.../main/groovy/lang/DeprecationException.java | 0
.../src => src}/main/groovy/lang/EmptyRange.java | 0
.../main/groovy/lang/ExpandoMetaClass.java | 0
.../lang/ExpandoMetaClassCreationHandle.java | 0
.../src => src}/main/groovy/lang/GString.java | 0
.../main/groovy/lang/GeneratedGroovyProxy.java | 0
.../src => src}/main/groovy/lang/Grab.java | 0
.../src => src}/main/groovy/lang/GrabConfig.java | 0
.../src => src}/main/groovy/lang/GrabExclude.java | 0
.../src => src}/main/groovy/lang/GrabResolver.java | 0
.../src => src}/main/groovy/lang/Grapes.java | 0
.../main/groovy/lang/GroovyCallable.java | 0
.../main/groovy/lang/GroovyClassLoader.java | 0
.../main/groovy/lang/GroovyCodeSource.java | 0
.../main/groovy/lang/GroovyInterceptable.java | 0
.../src => src}/main/groovy/lang/GroovyObject.java | 0
.../main/groovy/lang/GroovyObjectSupport.java | 0
.../main/groovy/lang/GroovyResourceLoader.java | 0
.../main/groovy/lang/GroovyRuntimeException.java | 0
.../src => src}/main/groovy/lang/GroovyShell.java | 0
.../src => src}/main/groovy/lang/GroovySystem.java | 0
.../lang/IllegalPropertyAccessException.java | 0
.../lang/IncorrectClosureArgumentsException.java | 0
.../src => src}/main/groovy/lang/IntRange.java | 0
.../src => src}/main/groovy/lang/Interceptor.java | 0
.../src => src}/main/groovy/lang/Lazy.java | 0
.../main/groovy/lang/ListWithDefault.java | 0
.../main/groovy/lang/MapWithDefault.java | 0
.../main/groovy/lang/MetaArrayLengthProperty.java | 0
.../main/groovy/lang/MetaBeanProperty.java | 0
.../src => src}/main/groovy/lang/MetaClass.java | 0
.../main/groovy/lang/MetaClassImpl.java | 0
.../main/groovy/lang/MetaClassRegistry.java | 0
.../groovy/lang/MetaClassRegistryChangeEvent.java | 0
.../lang/MetaClassRegistryChangeEventListener.java | 0
.../main/groovy/lang/MetaExpandoProperty.java | 0
.../src => src}/main/groovy/lang/MetaMethod.java | 0
.../main/groovy/lang/MetaObjectProtocol.java | 0
.../src => src}/main/groovy/lang/MetaProperty.java | 0
.../main/groovy/lang/MissingClassException.java | 0
.../main/groovy/lang/MissingFieldException.java | 0
.../main/groovy/lang/MissingMethodException.java | 0
.../main/groovy/lang/MissingPropertyException.java | 0
.../src => src}/main/groovy/lang/Mixin.java | 0
.../main/groovy/lang/MutableMetaClass.java | 0
.../src => src}/main/groovy/lang/Newify.java | 0
.../main/groovy/lang/NonEmptySequence.java | 0
.../src => src}/main/groovy/lang/ObjectRange.java | 0
.../main/groovy/lang/ParameterArray.java | 0
.../groovy/lang/PropertyAccessInterceptor.java | 0
.../main/groovy/lang/PropertyValue.java | 0
.../main/groovy/lang/ProxyMetaClass.java | 0
.../src => src}/main/groovy/lang/Range.java | 0
.../groovy/lang/ReadOnlyPropertyException.java | 0
.../src => src}/main/groovy/lang/Reference.java | 0
.../src => src}/main/groovy/lang/Script.java | 0
.../src => src}/main/groovy/lang/Sequence.java | 0
.../src => src}/main/groovy/lang/Singleton.java | 0
.../groovy/lang/SpreadListEvaluatingException.java | 0
.../src => src}/main/groovy/lang/SpreadMap.java | 0
.../groovy/lang/SpreadMapEvaluatingException.java | 0
.../main/groovy/lang/StringWriterIOException.java | 0
.../main/groovy/lang/TracingInterceptor.java | 0
.../main/groovy/lang/TrampolineClosure.java | 0
.../src => src}/main/groovy/lang/Tuple.java | 0
.../src => src}/main/groovy/lang/Tuple2.java | 0
.../src => src}/main/groovy/lang/Writable.java | 0
.../src => src}/main/groovy/lang/package.html | 0
.../security/GroovyCodeSourcePermission.java | 0
.../src => src}/main/groovy/security/package.html | 0
.../src => src}/main/groovy/time/BaseDuration.java | 0
.../main/groovy/time/DatumDependentDuration.java | 0
.../src => src}/main/groovy/time/Duration.java | 0
.../src => src}/main/groovy/time/TimeCategory.java | 0
.../groovy/time/TimeDatumDependentDuration.java | 0
.../src => src}/main/groovy/time/TimeDuration.java | 0
.../src => src}/main/groovy/time/package.html | 0
.../src => src}/main/groovy/transform/ASTTest.java | 0
.../main/groovy/transform/AnnotationCollector.java | 0
.../main/groovy/transform/AutoClone.java | 0
.../main/groovy/transform/AutoCloneStyle.java | 0
.../main/groovy/transform/AutoExternalize.groovy | 0
.../main/groovy/transform/BaseScript.java | 0
.../main/groovy/transform/Canonical.java | 0
.../groovy/transform/CompilationUnitAware.java | 0
.../main/groovy/transform/CompileDynamic.groovy | 0
.../main/groovy/transform/CompileStatic.java | 0
.../groovy/transform/ConditionalInterrupt.groovy | 0
.../main/groovy/transform/EqualsAndHashCode.java | 0
.../main/groovy/transform/ExternalizeMethods.java | 0
.../main/groovy/transform/ExternalizeVerifier.java | 0
.../src => src}/main/groovy/transform/Field.java | 0
.../main/groovy/transform/Immutable.java | 0
.../main/groovy/transform/IndexedProperty.java | 0
.../main/groovy/transform/InheritConstructors.java | 0
.../main/groovy/transform/Memoized.java | 0
.../main/groovy/transform/PackageScope.java | 0
.../main/groovy/transform/PackageScopeTarget.java | 0
.../main/groovy/transform/SelfType.java | 0
.../main/groovy/transform/Sortable.java | 0
.../main/groovy/transform/SourceURI.java | 0
.../main/groovy/transform/Synchronized.java | 0
.../main/groovy/transform/TailRecursive.groovy | 0
.../main/groovy/transform/ThreadInterrupt.groovy | 0
.../main/groovy/transform/TimedInterrupt.groovy | 0
.../main/groovy/transform/ToString.java | 0
.../src => src}/main/groovy/transform/Trait.java | 0
.../main/groovy/transform/TupleConstructor.java | 0
.../main/groovy/transform/TypeChecked.java | 0
.../main/groovy/transform/TypeCheckingMode.java | 0
.../main/groovy/transform/Undefined.java | 0
.../main/groovy/transform/WithReadLock.java | 0
.../main/groovy/transform/WithWriteLock.java | 0
.../main/groovy/transform/builder/Builder.java | 0
.../groovy/transform/builder/DefaultStrategy.java | 0
.../groovy/transform/builder/ExternalStrategy.java | 0
.../transform/builder/InitializerStrategy.java | 0
.../groovy/transform/builder/SimpleStrategy.java | 0
.../main/groovy/transform/stc/ClosureParams.java | 0
.../groovy/transform/stc/ClosureSignatureHint.java | 0
.../main/groovy/transform/stc/FirstParam.java | 0
.../transform/stc/FromAbstractTypeMethods.java | 0
.../main/groovy/transform/stc/FromString.java | 0
.../transform/stc/IncorrectTypeHintException.java | 0
.../groovy/transform/stc/MapEntryOrKeyValue.java | 0
.../groovy/transform/stc/PickAnyArgumentHint.java | 0
.../main/groovy/transform/stc/SecondParam.java | 0
.../main/groovy/transform/stc/SimpleType.java | 0
.../transform/stc/SingleSignatureClosureHint.java | 0
.../main/groovy/transform/stc/ThirdParam.java | 0
.../src => src}/main/groovy/ui/GroovyMain.java | 0
.../main/groovy/ui/GroovySocketServer.java | 0
.../main/groovy/util/AbstractFactory.java | 0
.../main/groovy/util/BuilderSupport.java | 0
.../main/groovy/util/CharsetToolkit.java | 0
.../src => src}/main/groovy/util/CliBuilder.groovy | 0
.../main/groovy/util/ClosureComparator.java | 0
.../src => src}/main/groovy/util/ConfigObject.java | 0
.../main/groovy/util/ConfigSlurper.groovy | 0
.../main/groovy/util/DelegatingScript.java | 0
.../src => src}/main/groovy/util/Eval.java | 0
.../src => src}/main/groovy/util/Expando.java | 0
.../src => src}/main/groovy/util/Factory.java | 0
.../main/groovy/util/FactoryBuilderSupport.java | 0
.../main/groovy/util/FileNameByRegexFinder.groovy | 0
.../main/groovy/util/FileTreeBuilder.groovy | 0
.../main/groovy/util/GroovyCollections.java | 0
.../main/groovy/util/GroovyScriptEngine.java | 0
.../main/groovy/util/IFileNameFinder.java | 0
.../main/groovy/util/IndentPrinter.java | 0
.../src => src}/main/groovy/util/MapEntry.java | 0
.../src => src}/main/groovy/util/Node.java | 0
.../src => src}/main/groovy/util/NodeBuilder.java | 0
.../src => src}/main/groovy/util/NodeList.java | 0
.../src => src}/main/groovy/util/NodePrinter.java | 0
.../main/groovy/util/ObjectGraphBuilder.java | 0
.../main/groovy/util/ObservableList.java | 0
.../main/groovy/util/ObservableMap.java | 0
.../main/groovy/util/ObservableSet.java | 0
.../src => src}/main/groovy/util/OrderBy.java | 0
.../main/groovy/util/PermutationGenerator.java | 0
.../src => src}/main/groovy/util/Proxy.java | 0
.../main/groovy/util/ProxyGenerator.java | 0
.../main/groovy/util/ResourceConnector.java | 0
.../main/groovy/util/ResourceException.java | 0
.../main/groovy/util/ScriptException.java | 0
.../main/groovy/util/logging/Commons.java | 0
.../src => src}/main/groovy/util/logging/Log.java | 0
.../main/groovy/util/logging/Log4j.java | 0
.../main/groovy/util/logging/Log4j2.java | 0
.../main/groovy/util/logging/Slf4j.java | 0
.../src => src}/main/groovy/util/package.html | 0
.../src => src}/main/groovy/xml/QName.java | 0
.../commons/cli/GroovyInternalPosixParser.java | 0
.../main/org/codehaus/groovy/GroovyBugError.java | 0
.../main/org/codehaus/groovy/GroovyException.java | 0
.../codehaus/groovy/GroovyExceptionInterface.java | 0
.../codehaus/groovy/antlr/ASTParserException.java | 0
.../codehaus/groovy/antlr/ASTRuntimeException.java | 0
.../groovy/antlr/AntlrASTProcessSnippets.java | 0
.../codehaus/groovy/antlr/AntlrASTProcessor.java | 0
.../codehaus/groovy/antlr/AntlrParserPlugin.java | 0
.../groovy/antlr/AntlrParserPluginFactory.java | 0
.../main/org/codehaus/groovy/antlr/EnumHelper.java | 0
.../org/codehaus/groovy/antlr/GroovySourceAST.java | 0
.../codehaus/groovy/antlr/GroovySourceToken.java | 0
.../main/org/codehaus/groovy/antlr/LexerFrame.java | 0
.../main/org/codehaus/groovy/antlr/LineColumn.java | 0
.../main/org/codehaus/groovy/antlr/Main.java | 0
.../org/codehaus/groovy/antlr/SourceBuffer.java | 0
.../main/org/codehaus/groovy/antlr/SourceInfo.java | 0
.../groovy/antlr/UnicodeEscapingReader.java | 0
.../groovy/antlr/UnicodeLexerSharedInputState.java | 0
.../main/org/codehaus/groovy/antlr/groovy.g | 0
.../org/codehaus/groovy/antlr/java/Groovifier.java | 0
.../groovy/antlr/java/Java2GroovyConverter.java | 0
.../groovy/antlr/java/Java2GroovyMain.java | 0
.../groovy/antlr/java/Java2GroovyProcessor.java | 0
.../groovy/antlr/java/PreJava2GroovyConverter.java | 0
.../main/org/codehaus/groovy/antlr/java/java.g | 0
.../main/org/codehaus/groovy/antlr/package.html | 0
.../groovy/antlr/treewalker/CompositeVisitor.java | 0
.../antlr/treewalker/FlatNodeListTraversal.java | 0
.../groovy/antlr/treewalker/MindMapPrinter.java | 0
.../groovy/antlr/treewalker/NodeAsHTMLPrinter.java | 0
.../groovy/antlr/treewalker/NodeCollector.java | 0
.../groovy/antlr/treewalker/NodePrinter.java | 0
.../groovy/antlr/treewalker/PreOrderTraversal.java | 0
.../antlr/treewalker/SourceCodeTraversal.java | 0
.../groovy/antlr/treewalker/SourcePrinter.java | 0
.../groovy/antlr/treewalker/TraversalHelper.java | 0
.../codehaus/groovy/antlr/treewalker/Visitor.java | 0
.../groovy/antlr/treewalker/VisitorAdapter.java | 0
.../codehaus/groovy/antlr/treewalker/package.html | 0
.../main/org/codehaus/groovy/ast/ASTNode.java | 0
.../org/codehaus/groovy/ast/AnnotatedNode.java | 0
.../org/codehaus/groovy/ast/AnnotationNode.java | 0
.../org/codehaus/groovy/ast/AstToTextHelper.java | 0
.../groovy/ast/ClassCodeExpressionTransformer.java | 0
.../groovy/ast/ClassCodeVisitorSupport.java | 0
.../main/org/codehaus/groovy/ast/ClassHelper.java | 0
.../main/org/codehaus/groovy/ast/ClassNode.java | 0
.../codehaus/groovy/ast/CodeVisitorSupport.java | 0
.../main/org/codehaus/groovy/ast/CompileUnit.java | 0
.../org/codehaus/groovy/ast/ConstructorNode.java | 0
.../org/codehaus/groovy/ast/DynamicVariable.java | 0
.../codehaus/groovy/ast/EnumConstantClassNode.java | 0
.../main/org/codehaus/groovy/ast/FieldNode.java | 0
.../main/org/codehaus/groovy/ast/GenericsType.java | 0
.../codehaus/groovy/ast/GroovyClassVisitor.java | 0
.../org/codehaus/groovy/ast/GroovyCodeVisitor.java | 0
.../main/org/codehaus/groovy/ast/ImportNode.java | 0
.../org/codehaus/groovy/ast/InnerClassNode.java | 0
.../groovy/ast/InterfaceHelperClassNode.java | 0
.../main/org/codehaus/groovy/ast/MethodNode.java | 0
.../groovy/ast/MixinASTTransformation.java | 0
.../main/org/codehaus/groovy/ast/MixinNode.java | 0
.../main/org/codehaus/groovy/ast/ModuleNode.java | 0
.../main/org/codehaus/groovy/ast/PackageNode.java | 0
.../main/org/codehaus/groovy/ast/Parameter.java | 0
.../main/org/codehaus/groovy/ast/PropertyNode.java | 0
.../main/org/codehaus/groovy/ast/Variable.java | 0
.../org/codehaus/groovy/ast/VariableScope.java | 0
.../codehaus/groovy/ast/builder/AstBuilder.groovy | 0
.../ast/builder/AstBuilderTransformation.java | 0
.../ast/builder/AstSpecificationCompiler.groovy | 0
.../groovy/ast/builder/AstStringCompiler.groovy | 0
.../ast/expr/AnnotationConstantExpression.java | 0
.../groovy/ast/expr/ArgumentListExpression.java | 0
.../codehaus/groovy/ast/expr/ArrayExpression.java | 0
.../groovy/ast/expr/AttributeExpression.java | 0
.../codehaus/groovy/ast/expr/BinaryExpression.java | 0
.../groovy/ast/expr/BitwiseNegationExpression.java | 0
.../groovy/ast/expr/BooleanExpression.java | 0
.../codehaus/groovy/ast/expr/CastExpression.java | 0
.../codehaus/groovy/ast/expr/ClassExpression.java | 0
.../groovy/ast/expr/ClosureExpression.java | 0
.../groovy/ast/expr/ClosureListExpression.java | 0
.../groovy/ast/expr/ConstantExpression.java | 0
.../groovy/ast/expr/ConstructorCallExpression.java | 0
.../groovy/ast/expr/DeclarationExpression.java | 0
.../groovy/ast/expr/ElvisOperatorExpression.java | 0
.../codehaus/groovy/ast/expr/EmptyExpression.java | 0
.../org/codehaus/groovy/ast/expr/Expression.java | 0
.../groovy/ast/expr/ExpressionTransformer.java | 0
.../codehaus/groovy/ast/expr/FieldExpression.java | 0
.../groovy/ast/expr/GStringExpression.java | 0
.../codehaus/groovy/ast/expr/ListExpression.java | 0
.../groovy/ast/expr/MapEntryExpression.java | 0
.../codehaus/groovy/ast/expr/MapExpression.java | 0
.../org/codehaus/groovy/ast/expr/MethodCall.java | 0
.../groovy/ast/expr/MethodCallExpression.java | 0
.../groovy/ast/expr/MethodPointerExpression.java | 0
.../ast/expr/NamedArgumentListExpression.java | 0
.../codehaus/groovy/ast/expr/NotExpression.java | 0
.../groovy/ast/expr/PostfixExpression.java | 0
.../codehaus/groovy/ast/expr/PrefixExpression.java | 0
.../groovy/ast/expr/PropertyExpression.java | 0
.../codehaus/groovy/ast/expr/RangeExpression.java | 0
.../codehaus/groovy/ast/expr/SpreadExpression.java | 0
.../groovy/ast/expr/SpreadMapExpression.java | 0
.../ast/expr/StaticMethodCallExpression.java | 0
.../groovy/ast/expr/TernaryExpression.java | 0
.../codehaus/groovy/ast/expr/TupleExpression.java | 0
.../groovy/ast/expr/UnaryMinusExpression.java | 0
.../groovy/ast/expr/UnaryPlusExpression.java | 0
.../groovy/ast/expr/VariableExpression.java | 0
.../main/org/codehaus/groovy/ast/expr/package.html | 0
.../main/org/codehaus/groovy/ast/package.html | 0
.../codehaus/groovy/ast/stmt/AssertStatement.java | 0
.../codehaus/groovy/ast/stmt/BlockStatement.java | 0
.../codehaus/groovy/ast/stmt/BreakStatement.java | 0
.../codehaus/groovy/ast/stmt/CaseStatement.java | 0
.../codehaus/groovy/ast/stmt/CatchStatement.java | 0
.../groovy/ast/stmt/ContinueStatement.java | 0
.../codehaus/groovy/ast/stmt/DoWhileStatement.java | 0
.../codehaus/groovy/ast/stmt/EmptyStatement.java | 0
.../groovy/ast/stmt/ExpressionStatement.java | 0
.../org/codehaus/groovy/ast/stmt/ForStatement.java | 0
.../org/codehaus/groovy/ast/stmt/IfStatement.java | 0
.../codehaus/groovy/ast/stmt/LoopingStatement.java | 0
.../codehaus/groovy/ast/stmt/ReturnStatement.java | 0
.../org/codehaus/groovy/ast/stmt/Statement.java | 0
.../codehaus/groovy/ast/stmt/SwitchStatement.java | 0
.../groovy/ast/stmt/SynchronizedStatement.java | 0
.../codehaus/groovy/ast/stmt/ThrowStatement.java | 0
.../groovy/ast/stmt/TryCatchStatement.java | 0
.../codehaus/groovy/ast/stmt/WhileStatement.java | 0
.../main/org/codehaus/groovy/ast/stmt/package.html | 0
.../codehaus/groovy/ast/tools/ClosureUtils.java | 0
.../codehaus/groovy/ast/tools/GeneralUtils.java | 0
.../codehaus/groovy/ast/tools/GenericsUtils.java | 0
.../groovy/ast/tools/WideningCategories.java | 0
.../groovy/classgen/AnnotationVisitor.java | 0
.../groovy/classgen/AsmClassGenerator.java | 0
.../groovy/classgen/BytecodeExpression.java | 0
.../groovy/classgen/BytecodeInstruction.java | 0
.../codehaus/groovy/classgen/BytecodeSequence.java | 0
.../groovy/classgen/ClassCompletionVerifier.java | 0
.../codehaus/groovy/classgen/ClassGenerator.java | 0
.../groovy/classgen/ClassGeneratorException.java | 0
.../groovy/classgen/DummyClassGenerator.java | 0
.../groovy/classgen/EnumCompletionVisitor.java | 0
.../org/codehaus/groovy/classgen/EnumVisitor.java | 0
.../codehaus/groovy/classgen/ExtendedVerifier.java | 0
.../codehaus/groovy/classgen/GeneratorContext.java | 0
.../classgen/InnerClassCompletionVisitor.java | 0
.../groovy/classgen/InnerClassVisitor.java | 0
.../groovy/classgen/InnerClassVisitorHelper.java | 0
.../org/codehaus/groovy/classgen/ReturnAdder.java | 0
.../groovy/classgen/VariableScopeVisitor.java | 0
.../org/codehaus/groovy/classgen/Verifier.java | 0
.../groovy/classgen/VerifierCodeVisitor.java | 0
.../groovy/classgen/asm/AssertionWriter.java | 0
.../asm/BinaryBooleanExpressionHelper.java | 0
.../classgen/asm/BinaryDoubleExpressionHelper.java | 0
.../classgen/asm/BinaryExpressionHelper.java | 0
.../asm/BinaryExpressionMultiTypeDispatcher.java | 0
.../classgen/asm/BinaryExpressionWriter.java | 0
.../classgen/asm/BinaryFloatExpressionHelper.java | 0
.../classgen/asm/BinaryIntExpressionHelper.java | 0
.../classgen/asm/BinaryLongExpressionHelper.java | 0
.../classgen/asm/BinaryObjectExpressionHelper.java | 0
.../groovy/classgen/asm/BytecodeDumper.java | 0
.../groovy/classgen/asm/BytecodeHelper.java | 0
.../groovy/classgen/asm/BytecodeVariable.java | 0
.../groovy/classgen/asm/CallSiteWriter.java | 0
.../groovy/classgen/asm/ClosureWriter.java | 0
.../codehaus/groovy/classgen/asm/CompileStack.java | 0
.../groovy/classgen/asm/DelegatingController.java | 0
.../classgen/asm/ExpressionAsVariableSlot.java | 0
.../groovy/classgen/asm/InvocationWriter.java | 0
.../codehaus/groovy/classgen/asm/MethodCaller.java | 0
.../classgen/asm/MethodCallerMultiAdapter.java | 0
.../codehaus/groovy/classgen/asm/MopWriter.java | 0
.../codehaus/groovy/classgen/asm/OperandStack.java | 0
.../classgen/asm/OptimizingStatementWriter.java | 0
.../classgen/asm/StatementMetaTypeChooser.java | 0
.../groovy/classgen/asm/StatementWriter.java | 0
.../codehaus/groovy/classgen/asm/TypeChooser.java | 0
.../groovy/classgen/asm/UnaryExpressionHelper.java | 0
.../groovy/classgen/asm/VariableSlotLoader.java | 0
.../groovy/classgen/asm/WriterController.java | 0
.../classgen/asm/WriterControllerFactory.java | 0
.../groovy/classgen/asm/indy/IndyBinHelper.java | 0
.../classgen/asm/indy/IndyCallSiteWriter.java | 0
.../classgen/asm/indy/InvokeDynamicWriter.java | 0
.../org/codehaus/groovy/classgen/asm/package.html | 0
.../asm/sc/StaticCompilationMopWriter.java | 0
.../classgen/asm/sc/StaticInvocationWriter.java | 0
.../asm/sc/StaticPropertyAccessHelper.java | 0
...icTypesBinaryExpressionMultiTypeDispatcher.java | 0
.../classgen/asm/sc/StaticTypesCallSiteWriter.java | 0
.../classgen/asm/sc/StaticTypesClosureWriter.java | 0
.../asm/sc/StaticTypesStatementWriter.java | 0
.../classgen/asm/sc/StaticTypesTypeChooser.java | 0
.../asm/sc/StaticTypesUnaryExpressionHelper.java | 0
.../asm/sc/StaticTypesWriterController.java | 0
.../sc/StaticTypesWriterControllerFactoryImpl.java | 0
.../codehaus/groovy/classgen/genArrayAccess.groovy | 0
.../org/codehaus/groovy/classgen/genArrays.groovy | 0
.../org/codehaus/groovy/classgen/genDgmMath.groovy | 0
.../groovy/classgen/genMathModification.groovy | 0
.../main/org/codehaus/groovy/classgen/package.html | 0
.../org/codehaus/groovy/cli/GroovyPosixParser.java | 0
.../groovy/control/ASTTransformationsContext.java | 0
.../groovy/control/AnnotationConstantsVisitor.java | 0
.../codehaus/groovy/control/BytecodeProcessor.java | 0
.../codehaus/groovy/control/ClassNodeResolver.java | 0
.../groovy/control/CompilationFailedException.java | 0
.../codehaus/groovy/control/CompilationUnit.java | 0
.../org/codehaus/groovy/control/CompilePhase.java | 0
.../groovy/control/CompilerConfiguration.java | 0
.../groovy/control/ConfigurationException.java | 0
.../codehaus/groovy/control/ErrorCollector.java | 0
.../codehaus/groovy/control/GenericsVisitor.java | 0
.../org/codehaus/groovy/control/HasCleanup.java | 0
.../main/org/codehaus/groovy/control/Janitor.java | 0
.../org/codehaus/groovy/control/LabelVerifier.java | 0
.../MultipleCompilationErrorsException.java | 0
.../codehaus/groovy/control/OptimizerVisitor.java | 0
.../org/codehaus/groovy/control/ParserPlugin.java | 0
.../groovy/control/ParserPluginFactory.java | 0
.../main/org/codehaus/groovy/control/Phases.java | 0
.../codehaus/groovy/control/ProcessingUnit.java | 0
.../codehaus/groovy/control/ResolveVisitor.java | 0
.../groovy/control/SourceExtensionHandler.java | 0
.../org/codehaus/groovy/control/SourceUnit.java | 0
.../groovy/control/StaticImportVisitor.java | 0
.../codehaus/groovy/control/StaticVerifier.java | 0
.../customizers/ASTTransformationCustomizer.groovy | 0
.../control/customizers/CompilationCustomizer.java | 0
.../control/customizers/DelegatingCustomizer.java | 0
.../control/customizers/ImportCustomizer.java | 0
.../control/customizers/SecureASTCustomizer.java | 0
.../control/customizers/SourceAwareCustomizer.java | 0
.../ASTTransformationCustomizerFactory.groovy | 0
.../builder/CompilerCustomizationBuilder.groovy | 0
.../customizers/builder/CustomizersFactory.java | 0
.../builder/ImportCustomizerFactory.java | 0
.../builder/InlinedASTCustomizerFactory.java | 0
.../customizers/builder/PostCompletionFactory.java | 0
.../builder/SecureASTCustomizerFactory.java | 0
.../builder/SourceAwareCustomizerFactory.java | 0
.../groovy/control/io/AbstractReaderSource.java | 0
.../groovy/control/io/FileReaderSource.java | 0
.../groovy/control/io/InputStreamReaderSource.java | 0
.../org/codehaus/groovy/control/io/NullWriter.java | 0
.../codehaus/groovy/control/io/ReaderSource.java | 0
.../groovy/control/io/StringReaderSource.java | 0
.../groovy/control/io/URLReaderSource.java | 0
.../org/codehaus/groovy/control/io/package.html | 0
.../groovy/control/messages/ExceptionMessage.java | 0
.../groovy/control/messages/LocatedMessage.java | 0
.../codehaus/groovy/control/messages/Message.java | 0
.../groovy/control/messages/SimpleMessage.java | 0
.../control/messages/SyntaxErrorMessage.java | 0
.../groovy/control/messages/WarningMessage.java | 0
.../codehaus/groovy/control/messages/package.html | 0
.../main/org/codehaus/groovy/control/package.html | 0
.../main/org/codehaus/groovy/package.html | 0
.../org/codehaus/groovy/plugin/GroovyRunner.java | 0
.../codehaus/groovy/reflection/CachedClass.java | 0
.../groovy/reflection/CachedConstructor.java | 0
.../codehaus/groovy/reflection/CachedField.java | 0
.../codehaus/groovy/reflection/CachedMethod.java | 0
.../org/codehaus/groovy/reflection/ClassInfo.java | 0
.../reflection/ClassLoaderForClassArtifacts.java | 0
.../groovy/reflection/GeneratedMetaMethod.java | 0
.../groovy/reflection/GroovyClassValue.java | 0
.../groovy/reflection/GroovyClassValueFactory.java | 0
.../reflection/GroovyClassValuePreJava7.java | 0
.../groovy/reflection/MixinInMetaClass.java | 0
.../codehaus/groovy/reflection/ParameterTypes.java | 0
.../groovy/reflection/ReflectionCache.java | 0
.../groovy/reflection/ReflectionUtils.java | 0
.../codehaus/groovy/reflection/SunClassLoader.java | 0
.../groovy/reflection/android/AndroidSupport.java | 0
.../org/codehaus/groovy/reflection/package.html | 0
.../reflection/stdclasses/ArrayCachedClass.java | 0
.../stdclasses/BigDecimalCachedClass.java | 0
.../stdclasses/BigIntegerCachedClass.java | 0
.../reflection/stdclasses/BooleanCachedClass.java | 0
.../reflection/stdclasses/ByteCachedClass.java | 0
.../reflection/stdclasses/CachedClosureClass.java | 0
.../reflection/stdclasses/CachedSAMClass.java | 0
.../stdclasses/CharacterCachedClass.java | 0
.../reflection/stdclasses/DoubleCachedClass.java | 0
.../reflection/stdclasses/FloatCachedClass.java | 0
.../reflection/stdclasses/IntegerCachedClass.java | 0
.../reflection/stdclasses/LongCachedClass.java | 0
.../reflection/stdclasses/NumberCachedClass.java | 0
.../reflection/stdclasses/ObjectCachedClass.java | 0
.../reflection/stdclasses/ShortCachedClass.java | 0
.../reflection/stdclasses/StringCachedClass.java | 0
.../reflection/v7/GroovyClassValueJava7.java | 0
.../groovy/runtime/AbstractComparator.java | 0
.../org/codehaus/groovy/runtime/ArrayUtil.java | 0
.../groovy/runtime/BytecodeInterface8.java | 0
.../org/codehaus/groovy/runtime/ClassExtender.java | 0
.../codehaus/groovy/runtime/ComposedClosure.java | 0
.../codehaus/groovy/runtime/ConversionHandler.java | 0
.../codehaus/groovy/runtime/ConvertedClosure.java | 0
.../org/codehaus/groovy/runtime/ConvertedMap.java | 0
.../codehaus/groovy/runtime/CurriedClosure.java | 0
.../codehaus/groovy/runtime/DateGroovyMethods.java | 0
.../groovy/runtime/DefaultCachedMethodKey.java | 0
.../groovy/runtime/DefaultGroovyMethods.java | 0
.../runtime/DefaultGroovyMethodsSupport.java | 0
.../groovy/runtime/DefaultGroovyStaticMethods.java | 0
.../codehaus/groovy/runtime/DefaultMethodKey.java | 0
.../groovy/runtime/EncodingGroovyMethods.java | 0
.../runtime/EncodingGroovyMethodsSupport.java | 0
.../groovy/runtime/FlushingStreamWriter.java | 0
.../org/codehaus/groovy/runtime/GStringImpl.java | 0
.../codehaus/groovy/runtime/GeneratedClosure.java | 0
.../groovy/runtime/GroovyCategorySupport.java | 0
.../codehaus/groovy/runtime/HandleMetaClass.java | 0
.../codehaus/groovy/runtime/IOGroovyMethods.java | 0
.../org/codehaus/groovy/runtime/InvokerHelper.java | 0
.../groovy/runtime/InvokerInvocationException.java | 0
.../groovy/runtime/IteratorClosureAdapter.java | 0
.../codehaus/groovy/runtime/MetaClassHelper.java | 0
.../org/codehaus/groovy/runtime/MethodClosure.java | 0
.../org/codehaus/groovy/runtime/MethodKey.java | 0
.../codehaus/groovy/runtime/MethodRankHelper.java | 0
.../org/codehaus/groovy/runtime/NullObject.java | 0
.../groovy/runtime/NumberAwareComparator.java | 0
.../groovy/runtime/ProcessGroovyMethods.java | 0
.../groovy/runtime/ProxyGeneratorAdapter.java | 0
.../org/codehaus/groovy/runtime/RangeInfo.java | 0
.../groovy/runtime/ReflectionMethodInvoker.java | 0
.../org/codehaus/groovy/runtime/Reflector.java | 0
.../org/codehaus/groovy/runtime/RegexSupport.java | 0
.../groovy/runtime/ResourceGroovyMethods.java | 0
.../groovy/runtime/ReverseListIterator.java | 0
.../groovy/runtime/ScriptBytecodeAdapter.java | 0
.../codehaus/groovy/runtime/ScriptReference.java | 0
.../groovy/runtime/SocketGroovyMethods.java | 0
.../codehaus/groovy/runtime/StackTraceUtils.java | 0
.../groovy/runtime/StringBufferWriter.java | 0
.../groovy/runtime/StringGroovyMethods.java | 0
.../org/codehaus/groovy/runtime/WritableFile.java | 0
.../groovy/runtime/callsite/AbstractCallSite.java | 0
.../runtime/callsite/BooleanClosureWrapper.java | 0
.../callsite/BooleanReturningMethodInvoker.java | 0
.../codehaus/groovy/runtime/callsite/CallSite.java | 0
.../groovy/runtime/callsite/CallSiteArray.java | 0
.../runtime/callsite/CallSiteAwareMetaMethod.java | 0
.../runtime/callsite/CallSiteClassLoader.java | 0
.../groovy/runtime/callsite/CallSiteGenerator.java | 0
.../callsite/ClassMetaClassGetPropertySite.java | 0
.../runtime/callsite/ConstructorMetaClassSite.java | 0
.../callsite/ConstructorMetaMethodSite.java | 0
.../groovy/runtime/callsite/ConstructorSite.java | 0
.../groovy/runtime/callsite/DummyCallSite.java | 0
.../callsite/GetEffectivePogoFieldSite.java | 0
.../callsite/GetEffectivePogoPropertySite.java | 0
.../callsite/GetEffectivePojoFieldSite.java | 0
.../callsite/GetEffectivePojoPropertySite.java | 0
.../runtime/callsite/GroovySunClassLoader.java | 0
.../runtime/callsite/MetaClassConstructorSite.java | 0
.../groovy/runtime/callsite/MetaClassSite.java | 0
.../groovy/runtime/callsite/MetaMethodSite.java | 0
.../groovy/runtime/callsite/NullCallSite.java | 0
.../callsite/PerInstancePojoMetaClassSite.java | 0
.../runtime/callsite/PogoGetPropertySite.java | 0
.../runtime/callsite/PogoInterceptableSite.java | 0
.../callsite/PogoMetaClassGetPropertySite.java | 0
.../groovy/runtime/callsite/PogoMetaClassSite.java | 0
.../runtime/callsite/PogoMetaMethodSite.java | 0
.../callsite/PojoMetaClassGetPropertySite.java | 0
.../groovy/runtime/callsite/PojoMetaClassSite.java | 0
.../runtime/callsite/PojoMetaMethodSite.java | 0
.../runtime/callsite/StaticMetaClassSite.java | 0
.../runtime/callsite/StaticMetaMethodSite.java | 0
.../groovy/runtime/dgmimpl/NumberNumberDiv.java | 0
.../runtime/dgmimpl/NumberNumberMetaMethod.java | 0
.../groovy/runtime/dgmimpl/NumberNumberMinus.java | 0
.../runtime/dgmimpl/NumberNumberMultiply.java | 0
.../groovy/runtime/dgmimpl/NumberNumberPlus.java | 0
.../dgmimpl/arrays/ArrayGetAtMetaMethod.java | 0
.../runtime/dgmimpl/arrays/ArrayMetaMethod.java | 0
.../dgmimpl/arrays/ArrayPutAtMetaMethod.java | 0
.../arrays/BooleanArrayGetAtMetaMethod.java | 0
.../arrays/BooleanArrayPutAtMetaMethod.java | 0
.../dgmimpl/arrays/ByteArrayGetAtMetaMethod.java | 0
.../dgmimpl/arrays/ByteArrayPutAtMetaMethod.java | 0
.../arrays/CharacterArrayGetAtMetaMethod.java | 0
.../arrays/CharacterArrayPutAtMetaMethod.java | 0
.../dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java | 0
.../dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java | 0
.../dgmimpl/arrays/FloatArrayGetAtMetaMethod.java | 0
.../dgmimpl/arrays/FloatArrayPutAtMetaMethod.java | 0
.../arrays/IntegerArrayGetAtMetaMethod.java | 0
.../arrays/IntegerArrayPutAtMetaMethod.java | 0
.../dgmimpl/arrays/LongArrayGetAtMetaMethod.java | 0
.../dgmimpl/arrays/LongArrayPutAtMetaMethod.java | 0
.../dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java | 0
.../dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java | 0
.../dgmimpl/arrays/ShortArrayGetAtMetaMethod.java | 0
.../dgmimpl/arrays/ShortArrayPutAtMetaMethod.java | 0
.../groovy/runtime/m12n/ExtensionModule.java | 0
.../runtime/m12n/ExtensionModuleRegistry.java | 0
.../runtime/m12n/ExtensionModuleScanner.java | 0
.../runtime/m12n/MetaInfExtensionModule.java | 0
.../runtime/m12n/PropertiesModuleFactory.java | 0
.../groovy/runtime/m12n/SimpleExtensionModule.java | 0
.../m12n/StandardPropertiesModuleFactory.java | 0
.../codehaus/groovy/runtime/memoize/LRUCache.java | 0
.../runtime/memoize/LRUProtectionStorage.java | 0
.../codehaus/groovy/runtime/memoize/Memoize.java | 0
.../groovy/runtime/memoize/MemoizeCache.java | 0
.../runtime/memoize/NullProtectionStorage.java | 0
.../groovy/runtime/memoize/ProtectionStorage.java | 0
.../runtime/memoize/UnlimitedConcurrentCache.java | 0
.../groovy/runtime/metaclass/ClosureMetaClass.java | 0
.../runtime/metaclass/ClosureMetaMethod.java | 0
.../runtime/metaclass/ClosureStaticMetaMethod.java | 0
.../runtime/metaclass/ConcurrentReaderHashMap.java | 0
.../runtime/metaclass/DefaultMetaClassInfo.java | 0
.../runtime/metaclass/MetaClassRegistryImpl.java | 0
.../groovy/runtime/metaclass/MetaMethodIndex.java | 0
.../groovy/runtime/metaclass/MethodHelper.java | 0
.../runtime/metaclass/MethodMetaProperty.java | 0
.../metaclass/MethodSelectionException.java | 0
.../metaclass/MissingMethodExceptionNoStack.java | 0
.../metaclass/MissingMethodExecutionFailed.java | 0
.../metaclass/MissingPropertyExceptionNoStack.java | 0
.../groovy/runtime/metaclass/MixedInMetaClass.java | 0
.../runtime/metaclass/MixinInstanceMetaMethod.java | 0
.../metaclass/MixinInstanceMetaProperty.java | 0
.../runtime/metaclass/MultipleSetterProperty.java | 0
.../runtime/metaclass/NewInstanceMetaMethod.java | 0
.../groovy/runtime/metaclass/NewMetaMethod.java | 0
.../runtime/metaclass/NewStaticMetaMethod.java | 0
.../groovy/runtime/metaclass/OwnedMetaClass.java | 0
.../runtime/metaclass/ReflectionMetaMethod.java | 0
.../groovy/runtime/metaclass/ReflectorLoader.java | 0
.../runtime/metaclass/TemporaryMethodKey.java | 0
.../metaclass/ThreadManagedMetaBeanProperty.java | 0
.../runtime/metaclass/TransformMetaMethod.java | 0
.../codehaus/groovy/runtime/metaclass/package.html | 0
.../main/org/codehaus/groovy/runtime/package.html | 0
.../runtime/powerassert/AssertionRenderer.java | 0
.../runtime/powerassert/PowerAssertionError.java | 0
.../groovy/runtime/powerassert/SourceText.java | 0
.../SourceTextNotAvailableException.java | 0
.../codehaus/groovy/runtime/powerassert/Value.java | 0
.../groovy/runtime/powerassert/ValueRecorder.java | 0
.../runtime/typehandling/BigDecimalMath.java | 0
.../runtime/typehandling/BigIntegerMath.java | 0
.../typehandling/DefaultTypeTransformation.java | 0
.../runtime/typehandling/FloatingPointMath.java | 0
.../runtime/typehandling/GroovyCastException.java | 0
.../groovy/runtime/typehandling/IntegerMath.java | 0
.../groovy/runtime/typehandling/LongMath.java | 0
.../groovy/runtime/typehandling/NumberMath.java | 0
.../typehandling/NumberMathModificationInfo.java | 0
.../runtime/typehandling/ShortTypeHandling.java | 0
.../groovy/runtime/typehandling/package.html | 0
.../groovy/runtime/wrappers/BooleanWrapper.java | 0
.../groovy/runtime/wrappers/ByteWrapper.java | 0
.../groovy/runtime/wrappers/CharWrapper.java | 0
.../groovy/runtime/wrappers/DoubleWrapper.java | 0
.../groovy/runtime/wrappers/FloatWrapper.java | 0
.../runtime/wrappers/GroovyObjectWrapper.java | 0
.../groovy/runtime/wrappers/IntWrapper.java | 0
.../groovy/runtime/wrappers/LongWrapper.java | 0
.../groovy/runtime/wrappers/PojoWrapper.java | 0
.../groovy/runtime/wrappers/ShortWrapper.java | 0
.../codehaus/groovy/runtime/wrappers/Wrapper.java | 0
.../codehaus/groovy/runtime/wrappers/package.html | 0
.../main/org/codehaus/groovy/syntax/ASTHelper.java | 0
.../main/org/codehaus/groovy/syntax/CSTNode.java | 0
.../main/org/codehaus/groovy/syntax/Numbers.java | 0
.../codehaus/groovy/syntax/ParserException.java | 0
.../org/codehaus/groovy/syntax/ReadException.java | 0
.../main/org/codehaus/groovy/syntax/Reduction.java | 0
.../groovy/syntax/RuntimeParserException.java | 0
.../codehaus/groovy/syntax/SyntaxException.java | 0
.../main/org/codehaus/groovy/syntax/Token.java | 0
.../org/codehaus/groovy/syntax/TokenException.java | 0
.../groovy/syntax/TokenMismatchException.java | 0
.../main/org/codehaus/groovy/syntax/Types.java | 0
.../main/org/codehaus/groovy/syntax/package.html | 0
.../main/org/codehaus/groovy/tools/Compiler.java | 0
.../org/codehaus/groovy/tools/DgmConverter.java | 0
.../org/codehaus/groovy/tools/ErrorReporter.java | 0
.../codehaus/groovy/tools/FileSystemCompiler.java | 0
.../org/codehaus/groovy/tools/GrapeMain.groovy | 0
.../main/org/codehaus/groovy/tools/GrapeUtil.java | 0
.../org/codehaus/groovy/tools/GroovyClass.java | 0
.../org/codehaus/groovy/tools/GroovyStarter.java | 0
.../codehaus/groovy/tools/LoaderConfiguration.java | 0
.../main/org/codehaus/groovy/tools/RootLoader.java | 0
.../org/codehaus/groovy/tools/StringHelper.java | 0
.../main/org/codehaus/groovy/tools/Utilities.java | 0
.../groovy/tools/ast/TransformTestHelper.groovy | 0
.../groovy/tools/gse/DependencyTracker.java | 0
.../codehaus/groovy/tools/gse/StringSetMap.java | 0
.../tools/javac/JavaAwareCompilationUnit.java | 0
.../tools/javac/JavaAwareResolveVisitor.java | 0
.../codehaus/groovy/tools/javac/JavaCompiler.java | 0
.../groovy/tools/javac/JavaCompilerFactory.java | 0
.../tools/javac/JavaStubCompilationUnit.java | 0
.../groovy/tools/javac/JavaStubGenerator.java | 0
.../groovy/tools/javac/JavacCompilerFactory.java | 0
.../groovy/tools/javac/JavacJavaCompiler.java | 0
.../org/codehaus/groovy/tools/javac/package.html | 0
.../main/org/codehaus/groovy/tools/package.html | 0
.../main/org/codehaus/groovy/tools/shell/IO.java | 0
.../codehaus/groovy/tools/shell/util/Logger.java | 0
.../groovy/tools/shell/util/MessageSource.java | 0
.../groovy/tools/shell/util/Preferences.java | 0
.../org/codehaus/groovy/tools/xml/package.html | 0
.../groovy/transform/ASTTestTransformation.groovy | 0
.../groovy/transform/ASTTransformation.java | 0
.../ASTTransformationCollectorCodeVisitor.java | 0
.../groovy/transform/ASTTransformationVisitor.java | 0
.../groovy/transform/AbstractASTTransformUtil.java | 0
.../transform/AbstractASTTransformation.java | 0
.../AbstractInterruptibleASTTransformation.java | 0
.../transform/AnnotationCollectorTransform.java | 0
.../transform/AutoCloneASTTransformation.java | 0
.../transform/BaseScriptASTTransformation.java | 0
.../groovy/transform/BuilderASTTransformation.java | 0
.../transform/CanonicalASTTransformation.java | 0
.../transform/CategoryASTTransformation.java | 0
.../groovy/transform/CompileDynamicProcessor.java | 0
...onditionalInterruptibleASTTransformation.groovy | 0
.../transform/DelegateASTTransformation.java | 0
.../EqualsAndHashCodeASTTransformation.java | 0
.../ExternalizeMethodsASTTransformation.java | 0
.../ExternalizeVerifierASTTransformation.java | 0
.../groovy/transform/FieldASTTransformation.java | 0
.../groovy/transform/GroovyASTTransformation.java | 0
.../transform/GroovyASTTransformationClass.java | 0
.../transform/ImmutableASTTransformation.java | 0
.../IndexedPropertyASTTransformation.java | 0
.../InheritConstructorsASTTransformation.java | 0
.../groovy/transform/LazyASTTransformation.java | 0
.../groovy/transform/LogASTTransformation.java | 0
.../transform/MemoizedASTTransformation.java | 0
.../groovy/transform/NewifyASTTransformation.java | 0
.../transform/PackageScopeASTTransformation.java | 0
.../transform/ReadWriteLockASTTransformation.java | 0
.../transform/SingletonASTTransformation.java | 0
.../transform/SortableASTTransformation.java | 0
.../transform/SourceURIASTTransformation.java | 0
.../transform/StaticTypesTransformation.java | 0
.../transform/SynchronizedASTTransformation.java | 0
.../ThreadInterruptibleASTTransformation.groovy | 0
.../TimedInterruptibleASTTransformation.groovy | 0
.../transform/ToStringASTTransformation.java | 0
.../TupleConstructorASTTransformation.java | 0
.../transform/sc/ListOfExpressionsExpression.java | 0
.../sc/StaticCompilationMetadataKeys.java | 0
.../transform/sc/StaticCompilationVisitor.java | 0
.../transform/sc/StaticCompileTransformation.java | 0
.../transform/sc/TemporaryVariableExpression.java | 0
.../transformers/BinaryExpressionTransformer.java | 0
.../transformers/BooleanExpressionTransformer.java | 0
.../sc/transformers/CastExpressionOptimizer.java | 0
.../transformers/ClosureExpressionTransformer.java | 0
.../sc/transformers/CompareIdentityExpression.java | 0
.../sc/transformers/CompareToNullExpression.java | 0
.../transformers/ConstructorCallTransformer.java | 0
.../sc/transformers/ListExpressionTransformer.java | 0
.../MethodCallExpressionTransformer.java | 0
.../transformers/RangeExpressionTransformer.java | 0
.../transformers/StaticCompilationTransformer.java | 0
.../StaticMethodCallExpressionTransformer.java | 0
.../VariableExpressionTransformer.java | 0
.../stc/AbstractTypeCheckingExtension.java | 0
.../stc/DefaultTypeCheckingExtension.java | 0
.../groovy/transform/stc/DelegationMetadata.java | 0
.../groovy/transform/stc/ExtensionMethodNode.java | 0
.../stc/GroovyTypeCheckingExtensionSupport.java | 0
.../transform/stc/PropertyLookupVisitor.java | 0
.../codehaus/groovy/transform/stc/Receiver.java | 0
.../groovy/transform/stc/SecondPassExpression.java | 0
.../transform/stc/SharedVariableCollector.java | 0
.../groovy/transform/stc/SignatureCodec.java | 0
.../transform/stc/SignatureCodecVersion1.java | 0
.../transform/stc/StaticTypeCheckingSupport.java | 0
.../transform/stc/StaticTypeCheckingVisitor.java | 0
.../groovy/transform/stc/StaticTypesMarker.java | 0
.../transform/stc/TraitTypeCheckingExtension.java | 0
.../groovy/transform/stc/TypeCheckingContext.java | 0
.../transform/stc/TypeCheckingExtension.java | 0
.../groovy/transform/stc/UnionTypeClassNode.java | 0
.../groovy/transform/tailrec/AstHelper.groovy | 0
.../transform/tailrec/CollectRecursiveCalls.groovy | 0
.../transform/tailrec/HasRecursiveCalls.groovy | 0
.../transform/tailrec/InWhileLoopWrapper.groovy | 0
.../transform/tailrec/RecursivenessTester.groovy | 0
.../tailrec/ReturnAdderForClosures.groovy | 0
.../ReturnStatementToIterationConverter.groovy | 0
.../transform/tailrec/StatementReplacer.groovy | 0
.../tailrec/TailRecursiveASTTransformation.groovy | 0
.../tailrec/TernaryToIfStatementConverter.groovy | 0
.../tailrec/VariableAccessReplacer.groovy | 0
.../tailrec/VariableExpressionReplacer.groovy | 0
.../tailrec/VariableExpressionTransformer.groovy | 0
.../transform/trait/NAryOperationRewriter.java | 0
.../transform/trait/SuperCallTraitTransformer.java | 0
.../transform/trait/TraitASTTransformation.java | 0
.../groovy/transform/trait/TraitComposer.java | 0
.../groovy/transform/trait/TraitHelpersTuple.java | 0
.../transform/trait/TraitReceiverTransformer.java | 0
.../codehaus/groovy/transform/trait/Traits.java | 0
.../util/AbstractConcurrentDoubleKeyMap.java | 0
.../groovy/util/AbstractConcurrentMap.java | 0
.../groovy/util/AbstractConcurrentMapBase.java | 0
.../org/codehaus/groovy/util/ArrayIterator.java | 0
.../codehaus/groovy/util/ComplexKeyHashMap.java | 0
.../org/codehaus/groovy/util/DoubleKeyHashMap.java | 0
.../main/org/codehaus/groovy/util/FastArray.java | 0
.../main/org/codehaus/groovy/util/Finalizable.java | 0
.../org/codehaus/groovy/util/HashCodeHelper.java | 0
.../org/codehaus/groovy/util/LazyReference.java | 0
.../main/org/codehaus/groovy/util/ListHashMap.java | 0
.../org/codehaus/groovy/util/LockableObject.java | 0
.../codehaus/groovy/util/ManagedConcurrentMap.java | 0
.../groovy/util/ManagedConcurrentValueMap.java | 0
.../codehaus/groovy/util/ManagedDoubleKeyMap.java | 0
.../codehaus/groovy/util/ManagedLinkedList.java | 0
.../org/codehaus/groovy/util/ManagedReference.java | 0
.../main/org/codehaus/groovy/util/Reference.java | 0
.../org/codehaus/groovy/util/ReferenceBundle.java | 0
.../org/codehaus/groovy/util/ReferenceManager.java | 0
.../org/codehaus/groovy/util/ReferenceType.java | 0
.../main/org/codehaus/groovy/util/ReleaseInfo.java | 0
.../org/codehaus/groovy/util/SingleKeyHashMap.java | 0
.../org/codehaus/groovy/util/StringUtil.groovy | 0
.../org/codehaus/groovy/util/TripleKeyHashMap.java | 0
.../org/codehaus/groovy/vmplugin/VMPlugin.java | 0
.../codehaus/groovy/vmplugin/VMPluginFactory.java | 0
.../main/org/codehaus/groovy/vmplugin/package.html | 0
.../codehaus/groovy/vmplugin/v5/JUnit4Utils.java | 0
.../org/codehaus/groovy/vmplugin/v5/Java5.java | 0
.../vmplugin/v5/PluginDefaultGroovyMethods.java | 0
.../org/codehaus/groovy/vmplugin/v5/package.html | 0
.../org/codehaus/groovy/vmplugin/v6/Java6.java | 0
.../v7/IndyGuardsFiltersAndSignatures.java | 0
.../codehaus/groovy/vmplugin/v7/IndyInterface.java | 0
.../org/codehaus/groovy/vmplugin/v7/IndyMath.java | 0
.../org/codehaus/groovy/vmplugin/v7/Java7.java | 0
.../org/codehaus/groovy/vmplugin/v7/Selector.java | 0
.../codehaus/groovy/vmplugin/v7/TypeHelper.java | 0
.../groovy/vmplugin/v7/TypeTransformers.java | 0
.../groovy-2.4.3/src => src}/main/overview.html | 0
.../groovy-2.4.3/src => src}/main/overviewj.html | 0
.../groovy-2.4.3/src => src}/native/base.c | 0
.../resources/groovy/grape/defaultGrapeConfig.xml | 0
.../src => src}/spec/assets/css/style.css | 0
.../src => src}/spec/assets/css/view-example.css | 0
.../spec/assets/img/additionalmodules.png | Bin
.../src => src}/spec/assets/img/console1.png | Bin
.../src => src}/spec/assets/img/console2.png | Bin
.../src => src}/spec/assets/img/console3.png | Bin
.../src => src}/spec/assets/img/console5.png | Bin
.../src => src}/spec/assets/img/console6.png | Bin
.../src => src}/spec/assets/img/console7.png | Bin
.../src => src}/spec/assets/img/example1.png | Bin
.../src => src}/spec/assets/img/example10.png | Bin
.../src => src}/spec/assets/img/example11.png | Bin
.../src => src}/spec/assets/img/example12.png | Bin
.../src => src}/spec/assets/img/example13.png | Bin
.../src => src}/spec/assets/img/example14.png | Bin
.../src => src}/spec/assets/img/example15.png | Bin
.../src => src}/spec/assets/img/example16.png | Bin
.../src => src}/spec/assets/img/example17.png | Bin
.../src => src}/spec/assets/img/example18.png | Bin
.../src => src}/spec/assets/img/example19.png | Bin
.../src => src}/spec/assets/img/example2.png | Bin
.../src => src}/spec/assets/img/example4.png | Bin
.../src => src}/spec/assets/img/example5.png | Bin
.../src => src}/spec/assets/img/example7.png | Bin
.../src => src}/spec/assets/img/example8.png | Bin
.../src => src}/spec/assets/img/example9.png | Bin
.../spec/assets/img/fileassociation.png | Bin
.../src => src}/spec/assets/img/github1.png | Bin
.../src => src}/spec/assets/img/github2.png | Bin
.../src => src}/spec/assets/img/github3.png | Bin
.../src => src}/spec/assets/img/github4.png | Bin
.../src => src}/spec/assets/img/github5.png | Bin
.../src => src}/spec/assets/img/github6.png | Bin
.../src => src}/spec/assets/img/githubfork.png | Bin
.../spec/assets/img/githubhomepanel.png | Bin
.../src => src}/spec/assets/img/githubsearch.png | Bin
.../src => src}/spec/assets/img/groovy.png | Bin
.../src => src}/spec/assets/img/groovy1.png | Bin
.../src => src}/spec/assets/img/native.jpg | Bin
.../src => src}/spec/assets/img/outdir.png | Bin
.../src => src}/spec/assets/img/repolist.png | Bin
.../src => src}/spec/assets/img/setup.png | Bin
.../src => src}/spec/assets/img/teamcity.png | Bin
.../src => src}/spec/assets/img/variables.jpg | Bin
.../src => src}/spec/assets/js/view-example.js | 0
.../assets/img/ChainOfResponsibilityClasses.gif | Bin
.../spec/doc/assets/img/CompositeClasses.gif | Bin
.../spec/doc/assets/img/CompositeComponents.gif | Bin
.../spec/doc/assets/img/StrategyClasses.gif | Bin
.../spec/doc/assets/img/TemplateMethodClasses.gif | Bin
.../src => src}/spec/doc/assets/img/a380.jpg | Bin
.../spec/doc/assets/img/additionalmodules.png | Bin
.../src => src}/spec/doc/assets/img/b797-hoax.jpg | Bin
.../src => src}/spec/doc/assets/img/catalina.gif | Bin
.../spec/doc/assets/img/fileassociation.png | Bin
.../spec/doc/assets/img/gconsole-toolbar.png | Bin
.../doc/assets/img/jconsole-implicit-export.png | Bin
.../src => src}/spec/doc/assets/img/jconsole.gif | Bin
.../src => src}/spec/doc/assets/img/native.jpg | Bin
.../src => src}/spec/doc/assets/img/oc4jpie.gif | Bin
.../src => src}/spec/doc/assets/img/outdir.png | Bin
.../src => src}/spec/doc/assets/img/setup.png | Bin
.../src => src}/spec/doc/assets/img/variables.jpg | Bin
.../src => src}/spec/doc/contributors.adoc | 0
.../src => src}/spec/doc/core-closures.adoc | 0
.../spec/doc/core-differences-java.adoc | 0
.../spec/doc/core-domain-specific-languages.adoc | 0
.../src => src}/spec/doc/core-gdk.adoc | 0
.../src => src}/spec/doc/core-getting-started.adoc | 0
.../src => src}/spec/doc/core-introduction.adoc | 0
.../src => src}/spec/doc/core-metaprogramming.adoc | 0
.../spec/doc/core-object-orientation.adoc | 0
.../src => src}/spec/doc/core-operators.adoc | 0
.../spec/doc/core-program-structure.adoc | 0
.../src => src}/spec/doc/core-semantics.adoc | 0
.../src => src}/spec/doc/core-syntax.adoc | 0
.../src => src}/spec/doc/core-testing-guide.adoc | 0
.../src => src}/spec/doc/core-traits.adoc | 0
.../spec/doc/design-pattern-abstract-factory.adoc | 0
.../spec/doc/design-pattern-adapter.adoc | 0
.../spec/doc/design-pattern-bouncer.adoc | 0
.../design-pattern-chain-of-responsibility.adoc | 0
.../spec/doc/design-pattern-composite.adoc | 0
.../spec/doc/design-pattern-decorator.adoc | 0
.../spec/doc/design-pattern-delegation.adoc | 0
.../spec/doc/design-pattern-flyweight.adoc | 0
.../spec/doc/design-pattern-in-groovy.adoc | 0
.../spec/doc/design-pattern-iterator.adoc | 0
.../spec/doc/design-pattern-loan-my-resource.adoc | 0
.../spec/doc/design-pattern-null-object.adoc | 0
.../spec/doc/design-pattern-pimp-my-library.adoc | 0
.../src => src}/spec/doc/design-pattern-proxy.adoc | 0
.../spec/doc/design-pattern-singleton.adoc | 0
.../src => src}/spec/doc/design-pattern-state.adoc | 0
.../spec/doc/design-pattern-strategy.adoc | 0
.../spec/doc/design-pattern-template-method.adoc | 0
.../spec/doc/design-pattern-visitor.adoc | 0
.../groovy-2.4.3/src => src}/spec/doc/grape.adoc | 0
.../src => src}/spec/doc/groovy-contributions.adoc | 0
.../src => src}/spec/doc/guide-integrating.adoc | 0
.../groovy-2.4.3/src => src}/spec/doc/index.adoc | 0
.../spec/doc/invokedynamic-support.adoc | 0
.../groovy-2.4.3/src => src}/spec/doc/license.adoc | 0
.../src => src}/spec/doc/style-guide.adoc | 0
.../src => src}/spec/doc/tools-groovyc.adoc | 0
.../src => src}/spec/doc/tools-groovyeclipse.adoc | 0
.../src => src}/spec/doc/tools-ide.adoc | 0
.../spec/doc/type-checking-extensions.adoc | 0
.../src => src}/spec/doc/version-scheme.adoc | 0
.../spec/doc/windows-nsis-installer.adoc | 0
.../spec/doc/working-with-collections.adoc | 0
.../src => src}/spec/doc/working-with-io.adoc | 0
.../org.codehaus.groovy.runtime.ExtensionModule | 0
...org.codehaus.groovy.runtime.ExtensionModuleSpec | 0
.../spec/test-resources/aftermethodcall.groovy | 0
.../spec/test-resources/aftervisitclass.groovy | 0
.../spec/test-resources/aftervisitmethod.groovy | 0
.../spec/test-resources/ambiguousmethods.groovy | 0
.../spec/test-resources/beforemethodcall.groovy | 0
.../spec/test-resources/beforevisitclass.groovy | 0
.../spec/test-resources/beforevisitmethod.groovy | 0
.../src => src}/spec/test-resources/finish.groovy | 0
.../test-resources/incompatibleassignment.groovy | 0
.../spec/test-resources/methodnotfound.groovy | 0
.../spec/test-resources/newmethod.groovy | 0
.../spec/test-resources/onmethodselection.groovy | 0
.../test-resources/reloading/dependency1.groovy | 0
.../test-resources/reloading/dependency2.groovy | 0
.../spec/test-resources/reloading/source1.groovy | 0
.../spec/test-resources/reloading/source2.groovy | 0
.../spec/test-resources/reloading/source3.groovy | 0
.../spec/test-resources/robotextension.groovy | 0
.../spec/test-resources/robotextension2.groovy | 0
.../spec/test-resources/robotextension3.groovy | 0
.../src => src}/spec/test-resources/scoping.groovy | 0
.../spec/test-resources/scoping_alt.groovy | 0
.../spec/test-resources/selfcheck.groovy | 0
.../src => src}/spec/test-resources/setup.groovy | 0
.../spec/test-resources/unresolvedattribute.groovy | 0
.../spec/test-resources/unresolvedproperty.groovy | 0
.../spec/test-resources/unresolvedvariable.groovy | 0
.../spec/test/BaseScriptSpecTest.groovy | 0
.../spec/test/ClassDesignASTTransformsTest.groovy | 0
.../src => src}/spec/test/ClassTest.groovy | 0
.../spec/test/CloningASTTransformsTest.groovy | 0
.../src => src}/spec/test/ClosuresSpecTest.groovy | 0
.../test/CodeGenerationASTTransformsTest.groovy | 0
.../src => src}/spec/test/CoercionTest.groovy | 0
.../src => src}/spec/test/CommandChainsTest.groovy | 0
.../CompilerDirectivesASTTransformsTest.groovy | 0
.../src => src}/spec/test/CustomizersTest.groovy | 0
.../DeclarativeConcurrencyASTTransformsTest.groovy | 0
.../spec/test/DelegatesToSpecTest.groovy | 0
.../spec/test/DesignPatternsTest.groovy | 0
.../spec/test/DifferencesFromJavaTest.groovy | 0
.../spec/test/ExtensionModuleSpecTest.groovy | 0
.../src => src}/spec/test/IntegrationTest.groovy | 0
.../test/LogImprovementsASTTransformsTest.groovy | 0
.../src => src}/spec/test/OperatorsTest.groovy | 0
.../src => src}/spec/test/PackageTest.groovy | 0
.../test/SaferScriptingASTTransformsTest.groovy | 0
.../spec/test/ScriptsAndClassesSpecTest.groovy | 0
.../src => src}/spec/test/SemanticsTest.groovy | 0
.../spec/test/SwingASTTransformsTest.groovy | 0
.../src => src}/spec/test/SyntaxTest.groovy | 0
.../spec/test/TestingASTTransformsTest.groovy | 0
.../spec/test/TraitsSpecificationTest.groovy | 0
.../src => src}/spec/test/asciidoctor/Utils.groovy | 0
.../spec/test/builder/BuilderSupportTest.groovy | 0
.../test/builder/ObjectGraphBuilderTest.groovy | 0
.../spec/test/gdk/ConfigSlurperTest.groovy | 0
.../src => src}/spec/test/gdk/ExpandoTest.groovy | 0
.../spec/test/gdk/ObservableTest.groovy | 0
.../test/gdk/WorkingWithCollectionsTest.groovy | 0
.../spec/test/gdk/WorkingWithIOSpecTest.groovy | 0
.../test/metaprogramming/ASTXFormSpecTest.groovy | 0
.../spec/test/metaprogramming/CategoryTest.groovy | 0
.../metaprogramming/ExpandoMetaClassTest.groovy | 0
.../MethodPropertyMissingTest.groovy | 0
.../test/metaprogramming/MyTransformToDebug.groovy | 0
.../spec/test/objectorientation/MethodsTest.groovy | 0
.../spec/test/semantics/GPathTest.groovy | 0
.../spec/test/semantics/LabelsTest.groovy | 0
.../spec/test/semantics/OptionalityTest.groovy | 0
.../spec/test/semantics/PowerAssertTest.groovy | 0
.../spec/test/semantics/TheGroovyTruthTest.groovy | 0
.../spec/test/support/MaxRetriesExtension.groovy | 0
.../spec/test/support/StaticStringExtension.groovy | 0
.../spec/test/testingguide/GDKMethodTests.groovy | 0
.../testingguide/GroovyTestCaseExampleTests.groovy | 0
.../test/testingguide/JUnit4ExampleTests.groovy | 0
.../test/testingguide/MockingExampleTests.groovy | 0
.../spec/test/thirdpartylib/MultiplyTwo.groovy | 0
.../spec/test/typing/OptionalTypingTest.groovy | 0
.../spec/test/typing/PrecompiledExtension.groovy | 0
.../spec/test/typing/PrecompiledJavaExtension.java | 0
.../src => src}/spec/test/typing/Robot.groovy | 0
.../test/typing/StaticCompilationIntroTest.groovy | 0
.../typing/TypeCheckingExtensionSpecTest.groovy | 0
.../spec/test/typing/TypeCheckingHintsTest.groovy | 0
.../spec/test/typing/TypeCheckingJavaTest.java | 0
.../spec/test/typing/TypeCheckingTest.groovy | 0
.../groovy-2.4.3/src => src}/tck/build.xml | 0
.../groovy-2.4.3/src => src}/tck/src/manifest.txt | 0
.../org/codehaus/groovy/tck/BatchGenerate.groovy | 0
.../tck/ClassicGroovyTestGeneratorHelper.java | 0
.../org/codehaus/groovy/tck/GenerateTestCases.java | 0
.../org/codehaus/groovy/tck/TestGenerator.groovy | 0
.../codehaus/groovy/tck/TestGeneratorHelper.java | 0
.../src => src}/tck/styles/junit-frames.xsl | 0
.../tck/test/gls/ch03/s01/Unicode1.groovy | 0
.../tck/test/gls/ch03/s01/Unicode2.groovy | 0
.../test/gls/ch03/s02/LexicalTranslation1.groovy | 0
.../tck/test/gls/ch03/s02/Longest1.groovy | 0
.../tck/test/gls/ch03/s03/UnicodeEscapes1.groovy | 0
.../tck/test/gls/ch03/s03/UnicodeEscapes2.groovy | 0
.../org.codehaus.groovy.runtime.ExtensionModule | 0
.../services/org.codehaus.groovy.source.Extensions | 0
.../groovy/grape/defaultGrapeConfig.xml | 0
.../groovy/transform/sc/MixedMode.groovy | 0
.../groovy/transform/sc/MixedMode2.groovy | 0
.../transform/sc/MixedModeDynamicBuilder.groovy | 0
.../groovy/transform/stc/AmbiguousMethods.groovy | 0
.../transform/stc/AnnotatedByTestExtension.groovy | 0
.../stc/ArgumentsTestingTestExtension.groovy | 0
.../stc/BeforeAfterClassTestExtension.groovy | 0
.../stc/BinaryOperatorTestExtension.groovy | 0
.../transform/stc/DelegatesToTestExtension.groovy | 0
.../transform/stc/FinishTestExtension.groovy | 0
.../stc/FirstArgumentsTestingTestExtension.groovy | 0
.../transform/stc/Groovy6047Extension.groovy | 0
.../stc/IncompatibleAssignmentTestExtension.groovy | 0
.../stc/IncompatibleReturnTypeTestExtension.groovy | 0
.../stc/MissingMethod1TestExtension.groovy | 0
.../stc/MissingMethod2TestExtension.groovy | 0
.../NewMethodAndIsGeneratedTestExtension.groovy | 0
.../stc/NthArgumentTestingTestExtension.groovy | 0
.../stc/OnMethodSelectionTestExtension.groovy | 0
.../stc/PrefixChangerTestExtension.groovy | 0
.../groovy/transform/stc/RobotMove.groovy | 0
.../stc/ScopeEnterExitTestExtension.groovy | 0
.../groovy/transform/stc/SetupTestExtension.groovy | 0
.../transform/stc/SilentTestExtension.groovy | 0
.../groovy/transform/stc/SprintfExtension.groovy | 0
.../UndefinedVariableNoHandleTestExtension.groovy | 0
.../stc/UndefinedVariableTestExtension.groovy | 0
.../stc/UnresolvedAttributeTestExtension.groovy | 0
.../stc/UnresolvedPropertyTestExtension.groovy | 0
.../stc/UpperCaseMethodTest1Extension.groovy | 0
.../stc/UpperCaseMethodTest2Extension.groovy | 0
.../stc/UpperCaseMethodTest3Extension.groovy | 0
.../circularLanguageReference/Rectangle.groovy | 0
.../circularLanguageReference/Shape.java | 0
.../circularLanguageReference/Square.java | 0
.../somepackage/GroovyPogo.groovy | 0
.../somepackage/JavaBean.java | 0
.../test/DefaultPackageClassSupport.java | 0
.../groovy-2.4.3/src => src}/test/Outer3.groovy | 0
.../groovy-2.4.3/src => src}/test/Outer4.groovy | 0
.../test/gls/CompilableTestSupport.groovy | 0
.../test/gls/annotations/AnnotationTest.groovy | 0
.../test/gls/annotations/CascadeType.java | 0
.../test/gls/annotations/JavaAnnotation.java | 0
.../test/gls/annotations/OneToMany.java | 0
.../test/gls/annotations/XmlEnum.groovy | 0
.../test/gls/annotations/XmlEnumValue.groovy | 0
.../AnnotationClosureExhaustiveTestSupport.groovy | 0
...nClosureJavaCompatibilityParameterizedTest.java | 0
.../AnnotationClosureJavaCompatibilityTest.java | 0
.../closures/AnnotationClosureOwnerCallTest.groovy | 0
.../closures/AnnotationClosureTest.groovy | 0
.../AnnotationClosureThisObjectCallTest.groovy | 0
.../AnnotationClosureUnqualifiedCallTest.groovy | 0
.../AnnotationClosureWithNonLocalVariable.groovy | 0
.../AnnotationClosureWithParametersTest.groovy | 0
.../closures/JavaAnnotationWithClassElement.java | 0
...avaAnnotationWithClassElementParameterized.java | 0
.../annotations/closures/JavaCompatibility.groovy | 0
.../closures/JavaCompatibilityParameterized.groovy | 0
.../test/gls/ch06/s05/GName1Test.groovy | 0
.../src => src}/test/gls/ch06/s05/JName1Test.java | 0
.../test/gls/ch06/s05/testClasses/Tt1.java | 0
.../test/gls/ch06/s05/testClasses/Tt1c.java | 0
.../test/gls/ch06/s05/testClasses/Tt1cgi.java | 0
.../test/gls/ch06/s05/testClasses/Tt1cgo.java | 0
.../test/gls/ch06/s05/testClasses/Tt1gi.java | 0
.../test/gls/ch06/s05/testClasses/Tt1go.java | 0
.../test/gls/ch08/s04/FormalParameterTest.groovy | 0
.../test/gls/ch08/s04/RepetitiveMethodTest.groovy | 0
.../src => src}/test/gls/enums/EnumTest.groovy | 0
.../test/gls/generics/GenericsTest.groovy | 0
.../test/gls/generics/GenericsTestBase.java | 0
.../test/gls/innerClass/InnerClassTest.groovy | 0
.../test/gls/innerClass/InnerInterfaceTest.groovy | 0
.../gls/invocation/ClassDuplicationTest.groovy | 0
.../gls/invocation/ClosureDelegationTest.groovy | 0
.../invocation/ConstructorDelegationTest.groovy | 0
.../test/gls/invocation/CovariantReturnTest.groovy | 0
.../test/gls/invocation/DefaultParamTest.groovy | 0
.../invocation/GroovyObjectInheritanceTest.groovy | 0
.../gls/invocation/MethodDeclarationTest.groovy | 0
.../test/gls/invocation/MethodSelectionTest.groovy | 0
.../invocation/StaticMethodInvocationTest.groovy | 0
.../gls/property/MetaClassOverridingTest.groovy | 0
.../test/gls/scope/BlockScopeVisibilityTest.groovy | 0
.../test/gls/scope/ClassVariableHidingTest.groovy | 0
.../test/gls/scope/FinalAccessTest.groovy | 0
.../MultipleDefinitionOfSameVariableTest.groovy | 0
.../test/gls/scope/NameResolvingTest.groovy | 0
.../test/gls/scope/StaticScopeTest.groovy | 0
.../test/gls/scope/VariablePrecedenceTest.groovy | 0
.../test/gls/sizelimits/StringSizeTest.groovy | 0
.../test/gls/statements/DeclarationTest.groovy | 0
.../MultipleAssignmentDeclarationTest.groovy | 0
.../gls/statements/MultipleAssignmentTest.groovy | 0
.../test/gls/statements/ReturnTest.groovy | 0
.../src => src}/test/gls/syntax/AssertTest.groovy | 0
.../test/gls/syntax/BinaryLiteralTest.groovy | 0
.../test/gls/syntax/Gep3OrderDslTest.groovy | 0
.../src => src}/test/gls/syntax/Gep3Test.groovy | 0
.../gls/syntax/MethodCallValidationTest.groovy | 0
.../test/gls/syntax/NumberLiteralTest.groovy | 0
.../gls/syntax/OldClosureSyntaxRemovalTest.groovy | 0
.../gls/syntax/OldPropertySyntaxRemovalTest.groovy | 0
.../test/gls/syntax/OldSpreadTest.groovy | 0
.../src => src}/test/gls/syntax/ParsingTest.groovy | 0
.../test/gls/syntax/UnderscoreInNumbersTest.groovy | 0
.../types/BooleanExpressionConversionTest.groovy | 0
.../test/gls/types/GroovyCastTest.groovy | 0
.../test/gls/types/OperationsResultTypeTest.groovy | 0
.../groovy/AbstractClassAndInterfaceTest.groovy | 0
.../src => src}/test/groovy/ActorTest.groovy | 0
.../test/groovy/AmbiguousInvocationTest.groovy | 0
.../test/groovy/ArrayAutoboxingTest.groovy | 0
.../src => src}/test/groovy/ArrayCoerceTest.groovy | 0
.../test/groovy/ArrayParamMethodTest.groovy | 0
.../src => src}/test/groovy/ArrayTest.groovy | 0
.../src => src}/test/groovy/ArrayTypeTest.groovy | 0
.../src => src}/test/groovy/AsTest.groovy | 0
.../test/groovy/AssertNumberTest.groovy | 0
.../src => src}/test/groovy/AssertTest.groovy | 0
.../src => src}/test/groovy/Bar.groovy | 0
.../src => src}/test/groovy/Base64Test.groovy | 0
.../test/groovy/BinaryStreamsTest.groovy | 0
.../src => src}/test/groovy/BindingTest.groovy | 0
.../src => src}/test/groovy/BitSetTest.groovy | 0
.../test/groovy/BreakContinueLabelTest.groovy | 0
.../test/groovy/CallInnerClassCtorTest.groovy | 0
.../src => src}/test/groovy/CastTest.groovy | 0
.../src => src}/test/groovy/CategoryTest.groovy | 0
.../test/groovy/ChainedAssignmentTest.groovy | 0
.../test/groovy/ClassExpressionTest.groovy | 0
.../src => src}/test/groovy/ClassLoaderBug.groovy | 0
.../src => src}/test/groovy/ClassTest.groovy | 0
.../test/groovy/ClosureAsParamTest.groovy | 0
.../test/groovy/ClosureCloneTest.groovy | 0
.../test/groovy/ClosureComparatorTest.groovy | 0
.../test/groovy/ClosureComposeTest.groovy | 0
.../test/groovy/ClosureCurryTest.groovy | 0
.../test/groovy/ClosureDefaultParameterTest.groovy | 0
.../test/groovy/ClosureInClosureTest.groovy | 0
.../test/groovy/ClosureInStaticMethodTest.groovy | 0
.../test/groovy/ClosureJavaIntegrationTest.java | 0
.../test/groovy/ClosureMethodCallTest.groovy | 0
.../test/groovy/ClosureMethodTest.groovy | 0
.../test/groovy/ClosureMethodsOnFileTest.groovy | 0
.../test/groovy/ClosureMissingMethodTest.groovy | 0
.../test/groovy/ClosureReturnTest.groovy | 0
.../ClosureReturnWithoutReturnStatementTest.groovy | 0
.../test/groovy/ClosureSugarTest.groovy | 0
.../src => src}/test/groovy/ClosureTest.groovy | 0
.../groovy/ClosureUsingOuterVariablesTest.groovy | 0
.../test/groovy/ClosureWithDefaultParamTest.groovy | 0
.../groovy/ClosureWithEmptyParametersTest.groovy | 0
.../src => src}/test/groovy/CollateTest.groovy | 0
.../test/groovy/CompareEqualsTest.groovy | 0
.../src => src}/test/groovy/CompareToTest.groovy | 0
.../test/groovy/CompareTypesTest.groovy | 0
.../test/groovy/CompileOrderTest.groovy | 0
.../test/groovy/CompilerErrorTest.groovy | 0
.../test/groovy/Constructor2Test.groovy | 0
.../src => src}/test/groovy/ConstructorTest.groovy | 0
.../test/groovy/CurlyBracketLayoutTest.groovy | 0
.../src => src}/test/groovy/DateTest.groovy | 0
.../test/groovy/DefaultParamClosureTest.groovy | 0
.../src => src}/test/groovy/DoWhileLoopTest.groovy | 0
.../test/groovy/DollarEscapingTest.groovy | 0
.../src => src}/test/groovy/DownUpStepTest.groovy | 0
.../src => src}/test/groovy/DummyInterface.java | 0
.../test/groovy/DummyMethodsGroovy.groovy | 0
.../src => src}/test/groovy/DummyMethodsJava.java | 0
.../test/groovy/DynamicMemberTest.groovy | 0
.../src => src}/test/groovy/EqualsTest.groovy | 0
.../test/groovy/EscapedUnicodeTest.groovy | 0
.../test/groovy/ExceptionInClosureTest.groovy | 0
.../test/groovy/ExpandoPropertyTest.groovy | 0
.../src => src}/test/groovy/FileTest.groovy | 0
.../src => src}/test/groovy/FilterLineTest.groovy | 0
.../src => src}/test/groovy/FinallyTest.groovy | 0
.../src => src}/test/groovy/Foo.groovy | 0
.../src => src}/test/groovy/ForLoopTest.groovy | 0
.../groovy/ForLoopWithLocalVariablesTest.groovy | 0
.../src => src}/test/groovy/GStringTest.groovy | 0
.../src => src}/test/groovy/GeneratorTest.groovy | 0
.../test/groovy/GlobalPrintlnTest.groovy | 0
.../groovy/GroovyCharSequenceMethodsTest.groovy | 0
.../test/groovy/GroovyClosureMethodsTest.groovy | 0
.../test/groovy/GroovyInterceptableTest.groovy | 0
.../test/groovy/GroovyMethodsTest.groovy | 0
.../src => src}/test/groovy/GroovyTruthTest.groovy | 0
.../src => src}/test/groovy/HeredocsTest.groovy | 0
.../src => src}/test/groovy/HexTest.groovy | 0
.../src => src}/test/groovy/HomepageTest.groovy | 0
.../test/groovy/IdentityClosureTest.groovy | 0
.../test/groovy/IfElseCompactTest.groovy | 0
.../src => src}/test/groovy/IfElseTest.groovy | 0
.../src => src}/test/groovy/IfPropertyTest.groovy | 0
.../src => src}/test/groovy/IfTest.groovy | 0
.../test/groovy/IfWithMethodCallTest.groovy | 0
.../test/groovy/ImmutableModificationTest.groovy | 0
.../src => src}/test/groovy/ImportTest.groovy | 0
.../src => src}/test/groovy/InstanceofTest.groovy | 0
.../src => src}/test/groovy/InterfaceTest.groovy | 0
.../groovy/InvokeNormalMethodsFirstTest.groovy | 0
.../src => src}/test/groovy/JavaClass.java | 0
.../src => src}/test/groovy/JointGroovy.groovy | 0
.../src => src}/test/groovy/JointJava.java | 0
.../test/groovy/KeywordsInPropertyNamesTest.groovy | 0
.../src => src}/test/groovy/Language.java | 0
.../src => src}/test/groovy/LeftShiftTest.groovy | 0
.../test/groovy/ListIteratingTest.groovy | 0
.../src => src}/test/groovy/ListTest.groovy | 0
.../test/groovy/LiteralTypesTest.groovy | 0
.../test/groovy/LittleClosureTest.groovy | 0
.../src => src}/test/groovy/LocalFieldTest.groovy | 0
.../test/groovy/LocalPropertyTest.groovy | 0
.../test/groovy/LocalVariableTest.groovy | 0
.../src => src}/test/groovy/LogicTest.groovy | 0
.../src => src}/test/groovy/LoopBreakTest.groovy | 0
.../test/groovy/MapConstructionTest.groovy | 0
.../src => src}/test/groovy/MapPropertyTest.groovy | 0
.../src => src}/test/groovy/MapTest.groovy | 0
.../src => src}/test/groovy/MethodCallTest.groovy | 0
.../groovy/MethodCallWithoutParenthesisTest.groovy | 0
.../test/groovy/MethodInBadPositionTest.groovy | 0
.../MethodParameterAccessWithinClosureTest.groovy | 0
.../src => src}/test/groovy/MinMaxTest.groovy | 0
.../src => src}/test/groovy/MinusEqualsTest.groovy | 0
.../src => src}/test/groovy/ModifiersTest.groovy | 0
.../src => src}/test/groovy/ModuloTest.groovy | 0
.../src => src}/test/groovy/MultiCatchTest.groovy | 0
.../test/groovy/MultiDimArraysTest.groovy | 0
.../groovy/MultilineChainExpressionTest.groovy | 0
.../test/groovy/MultilineStringTest.groovy | 0
.../test/groovy/MultiplyDivideEqualsTest.groovy | 0
.../test/groovy/NamedParameterTest.groovy | 0
.../src => src}/test/groovy/NestedClassTest.groovy | 0
.../test/groovy/NewExpressionTest.groovy | 0
.../src => src}/test/groovy/NoPackageTest.groovy | 0
.../test/groovy/NullPropertyTest.groovy | 0
.../src => src}/test/groovy/NumberMathTest.groovy | 0
.../test/groovy/OptionalReturnTest.groovy | 0
.../src => src}/test/groovy/OuterUser.java | 0
.../test/groovy/OverloadInvokeMethodTest.groovy | 0
.../test/groovy/OverridePropertyGetterTest.groovy | 0
.../src => src}/test/groovy/OverrideTest.groovy | 0
.../src => src}/test/groovy/PlusEqualsTest.groovy | 0
.../src => src}/test/groovy/PostfixTest.groovy | 0
.../src => src}/test/groovy/PrefixTest.groovy | 0
.../test/groovy/PrimitiveArraysTest.groovy | 0
.../test/groovy/PrimitiveDefaultValueTest.groovy | 0
.../test/groovy/PrimitiveTypeFieldTest.groovy | 0
.../test/groovy/PrimitiveTypesTest.groovy | 0
.../src => src}/test/groovy/PrintTest.groovy | 0
...ateVariableAccessFromAnotherInstanceTest.groovy | 0
.../src => src}/test/groovy/ProcessTest.groovy | 0
.../src => src}/test/groovy/Property2Test.groovy | 0
.../src => src}/test/groovy/PropertyTest.groovy | 0
.../test/groovy/PropertyWithoutDotTest.groovy | 0
.../src => src}/test/groovy/RangeTest.groovy | 0
.../src => src}/test/groovy/ReadLineTest.groovy | 0
.../test/groovy/RegularExpressionsTest.groovy | 0
.../src => src}/test/groovy/ReturnTest.groovy | 0
.../test/groovy/SafeNavigationTest.groovy | 0
.../src => src}/test/groovy/SampleMain.groovy | 0
.../src => src}/test/groovy/SerializeTest.groovy | 0
.../src => src}/test/groovy/SetTest.groovy | 0
.../src => src}/test/groovy/ShellTest.groovy | 0
.../test/groovy/SimplePostfixTest.groovy | 0
.../test/groovy/SingletonBugTest.groovy | 0
.../src => src}/test/groovy/SliceTest.groovy | 0
.../src => src}/test/groovy/SocketTest.groovy | 0
.../src => src}/test/groovy/SomeClass.java | 0
.../src => src}/test/groovy/SortTest.groovy | 0
.../src => src}/test/groovy/SpreadDotTest.groovy | 0
.../src => src}/test/groovy/SqlDateTest.groovy | 0
.../src => src}/test/groovy/StackTraceTest.groovy | 0
.../test/groovy/StaticImportTarget.groovy | 0
.../test/groovy/StaticImportTest.groovy | 0
.../test/groovy/StaticMessageTest.groovy | 0
.../src => src}/test/groovy/StaticThisTest.groovy | 0
.../test/groovy/StringBufferTest.groovy | 0
.../src => src}/test/groovy/StringTest.groovy | 0
.../src => src}/test/groovy/SubscriptTest.groovy | 0
.../src => src}/test/groovy/SwitchTest.groovy | 0
.../groovy/SwitchWithDifferentTypesTest.groovy | 0
.../src => src}/test/groovy/TestInterruptor.java | 0
.../test/groovy/TextPropertyTest.groovy | 0
.../test/groovy/ThisAndSuperTest.groovy | 0
.../test/groovy/ThreadMethodsTest.groovy | 0
.../src => src}/test/groovy/ThrowTest.groovy | 0
.../src => src}/test/groovy/ToArrayBugTest.groovy | 0
.../test/groovy/TripleQuotedStringTest.groovy | 0
.../src => src}/test/groovy/TryCatchTest.groovy | 0
.../test/groovy/TypesafeMethodTest.groovy | 0
.../test/groovy/UniqueOnCollectionTest.groovy | 0
.../UniqueOnCollectionWithClosureTest.groovy | 0
.../UniqueOnCollectionWithComparatorTest.groovy | 0
.../test/groovy/UnitTestAsScriptTest.groovy | 0
.../test/groovy/UnsafeNavigationTest.groovy | 0
.../src => src}/test/groovy/VArgsTest.groovy | 0
.../src => src}/test/groovy/ValidNameTest.groovy | 0
.../test/groovy/VarargsMethodTest.groovy | 0
.../test/groovy/VerbatimGStringTest.groovy | 0
.../src => src}/test/groovy/WhileLoopTest.groovy | 0
.../test/groovy/annotations/MyClass.groovy | 0
.../test/groovy/annotations/MyIntegerAnno.groovy | 0
.../MyIntegerAnnoTraceASTTransformation.java | 0
.../PackageAndImportAnnotationTest.groovy | 0
.../annotations/ParameterAnnotationTest.groovy | 0
.../test/groovy/annotations/package-info.groovy | 0
.../test/groovy/beans/BindableTest.groovy | 0
.../test/groovy/beans/ListenerListASTTest.groovy | 0
.../test/groovy/beans/ListenerListHelper.groovy | 0
.../test/groovy/beans/VetoableTest.groovy | 0
.../test/groovy/benchmarks/createLoop.groovy | 0
.../src => src}/test/groovy/benchmarks/loop.groovy | 0
.../test/groovy/benchmarks/loop2.groovy | 0
.../groovy/bugs/AmbiguousListOrMethodTest.groovy | 0
.../test/groovy/bugs/ArrayMethodCallBug.groovy | 0
.../src => src}/test/groovy/bugs/AsBoolBug.groovy | 0
.../bugs/AssignmentInsideExpressionBug.groovy | 0
.../groovy/bugs/AttributeSetExpressionBug.groovy | 0
.../groovy/bugs/AutoboxingOfComparisonsBug.groovy | 0
.../bugs/BadLineNumberOnExceptionBugTest.groovy | 0
.../test/groovy/bugs/BadScriptNameBug.groovy | 0
.../test/groovy/bugs/BenchmarkBug.groovy | 0
.../test/groovy/bugs/BlockAsClosureBug.groovy | 0
.../src => src}/test/groovy/bugs/BooleanBug.groovy | 0
.../test/groovy/bugs/ByteIndexBug.groovy | 0
.../test/groovy/bugs/Bytecode2Bug.groovy | 0
.../test/groovy/bugs/Bytecode3Bug.groovy | 0
.../test/groovy/bugs/Bytecode4Bug.groovy | 0
.../test/groovy/bugs/Bytecode5Bug.groovy | 0
.../test/groovy/bugs/Bytecode6Bug.groovy | 0
.../test/groovy/bugs/Bytecode7Bug.groovy | 0
.../test/groovy/bugs/BytecodeBug.groovy | 0
.../bugs/CallingClosuresWithClosuresBug.groovy | 0
.../groovy/bugs/CastWhenUsingClosuresBug.groovy | 0
.../test/groovy/bugs/ChristofsPropertyBug.groovy | 0
.../groovy/bugs/ClassGeneratorFixesTest.groovy | 0
.../test/groovy/bugs/ClassInNamedParamsBug.groovy | 0
.../test/groovy/bugs/ClassInScriptBug.java | 0
.../test/groovy/bugs/ClosureInClosureBug.groovy | 0
.../groovy/bugs/ClosureParameterPassingBug.groovy | 0
.../groovy/bugs/ClosureTypedVariableBug.groovy | 0
.../test/groovy/bugs/ClosureVariableBug.groovy | 0
.../bugs/ClosureWithBitwiseDefaultParamTest.groovy | 0
.../bugs/ClosureWithStaticVariablesBug.groovy | 0
.../test/groovy/bugs/ClosuresInScriptBug.java | 0
.../test/groovy/bugs/ConstructorBug.groovy | 0
.../groovy/bugs/ConstructorParameterBug.groovy | 0
.../test/groovy/bugs/ConstructorThisCallBug.groovy | 0
.../test/groovy/bugs/CustomMetaClassTest.groovy | 0
.../test/groovy/bugs/DefVariableBug.groovy | 0
.../bugs/DirectMethodCallWithVargsTest.groovy | 0
.../groovy/bugs/DoubleSizeParametersBug.groovy | 0
.../src => src}/test/groovy/bugs/ForLoopBug.groovy | 0
.../test/groovy/bugs/FullyQualifiedClassBug.groovy | 0
.../bugs/FullyQualifiedMethodReturnTypeBug.groovy | 0
.../bugs/FullyQualifiedVariableTypeBug.groovy | 0
.../src => src}/test/groovy/bugs/G3839A1.java | 0
.../src => src}/test/groovy/bugs/G3839A2.java | 0
.../src => src}/test/groovy/bugs/G3839A3.java | 0
.../src => src}/test/groovy/bugs/G3839A4.java | 0
.../test/groovy/bugs/G3839Transform1.java | 0
.../test/groovy/bugs/G3839Transform2.java | 0
.../test/groovy/bugs/G3839Transform3.java | 0
.../test/groovy/bugs/G4410JavaStringProducer.java | 0
.../test/groovy/bugs/G4410Producer1.java | 0
.../test/groovy/bugs/G4410Producer2.java | 0
.../test/groovy/bugs/GROOVY3934Helper.groovy | 0
.../src => src}/test/groovy/bugs/GetterBug.groovy | 0
.../test/groovy/bugs/Groovy1018_Bug.groovy | 0
.../test/groovy/bugs/Groovy1059_Bug.groovy | 0
.../test/groovy/bugs/Groovy1081_Bug.groovy | 0
.../test/groovy/bugs/Groovy1407_Bug.groovy | 0
.../test/groovy/bugs/Groovy1462_Bug.groovy | 0
.../test/groovy/bugs/Groovy1465Bug.groovy | 0
.../test/groovy/bugs/Groovy1567_Bug.java | 0
.../src => src}/test/groovy/bugs/Groovy1593.groovy | 0
.../test/groovy/bugs/Groovy1617_Bug.groovy | 0
.../test/groovy/bugs/Groovy1706_Bug.groovy | 0
.../test/groovy/bugs/Groovy1759_Bug.groovy | 0
.../test/groovy/bugs/Groovy2271Bug.groovy | 0
.../test/groovy/bugs/Groovy2339Bug.groovy | 0
.../test/groovy/bugs/Groovy2348Bug.groovy | 0
.../test/groovy/bugs/Groovy2350Bug.groovy | 0
.../test/groovy/bugs/Groovy2351Bug.groovy | 0
.../test/groovy/bugs/Groovy2365Base.groovy | 0
.../test/groovy/bugs/Groovy2365Bug.java | 0
.../test/groovy/bugs/Groovy2391Bug.groovy | 0
.../test/groovy/bugs/Groovy239_Bug.groovy | 0
.../test/groovy/bugs/Groovy2432Bug.groovy | 0
.../test/groovy/bugs/Groovy2490Bug.groovy | 0
.../test/groovy/bugs/Groovy252_Bug.groovy | 0
.../test/groovy/bugs/Groovy2549Bug.groovy | 0
.../test/groovy/bugs/Groovy2553Bug.java | 0
.../test/groovy/bugs/Groovy2556Bug.groovy | 0
.../test/groovy/bugs/Groovy2557Bug.groovy | 0
.../test/groovy/bugs/Groovy2558Bug.groovy | 0
.../test/groovy/bugs/Groovy2666Bug.groovy | 0
.../test/groovy/bugs/Groovy2706Bug.groovy | 0
.../test/groovy/bugs/Groovy278_Bug.groovy | 0
.../test/groovy/bugs/Groovy2801Bug.groovy | 0
.../test/groovy/bugs/Groovy2816Bug.groovy | 0
.../test/groovy/bugs/Groovy2849Bug.groovy | 0
.../test/groovy/bugs/Groovy2949Bug.groovy | 0
.../test/groovy/bugs/Groovy2951Bug.groovy | 0
.../test/groovy/bugs/Groovy3069Bug.groovy | 0
.../test/groovy/bugs/Groovy308_Bug.groovy | 0
.../test/groovy/bugs/Groovy3135Bug.groovy | 0
.../test/groovy/bugs/Groovy3139Bug.groovy | 0
.../test/groovy/bugs/Groovy3156And2621Bug.groovy | 0
.../test/groovy/bugs/Groovy3163Bug.groovy | 0
.../test/groovy/bugs/Groovy3175_Bug.groovy | 0
.../test/groovy/bugs/Groovy3205Bug.groovy | 0
.../test/groovy/bugs/Groovy3208Bug.groovy | 0
.../test/groovy/bugs/Groovy3235Bug.groovy | 0
.../test/groovy/bugs/Groovy3238Bug.groovy | 0
.../test/groovy/bugs/Groovy325_Bug.groovy | 0
.../test/groovy/bugs/Groovy3304Bug.groovy | 0
.../test/groovy/bugs/Groovy3305Bug.groovy | 0
.../test/groovy/bugs/Groovy3311Bug.groovy | 0
.../test/groovy/bugs/Groovy3335Bug.groovy | 0
.../test/groovy/bugs/Groovy3339Bug.groovy | 0
.../test/groovy/bugs/Groovy3383Bug.groovy | 0
.../test/groovy/bugs/Groovy3389Bug.groovy | 0
.../test/groovy/bugs/Groovy3403Bug.groovy | 0
.../test/groovy/bugs/Groovy3405Bug.groovy | 0
.../test/groovy/bugs/Groovy3410Bug.groovy | 0
.../test/groovy/bugs/Groovy3424Bug.groovy | 0
.../test/groovy/bugs/Groovy3426Bug.groovy | 0
.../test/groovy/bugs/Groovy3462Bug.groovy | 0
.../test/groovy/bugs/Groovy3464Bug.groovy | 0
.../test/groovy/bugs/Groovy3465Bug.groovy | 0
.../test/groovy/bugs/Groovy3465Helper.groovy | 0
.../test/groovy/bugs/Groovy3498Bug.groovy | 0
.../test/groovy/bugs/Groovy3509Bug.groovy | 0
.../test/groovy/bugs/Groovy3511Bug.groovy | 0
.../test/groovy/bugs/Groovy3519Bug.groovy | 0
.../test/groovy/bugs/Groovy3560Bug.groovy | 0
.../test/groovy/bugs/Groovy3560Helper.java | 0
.../test/groovy/bugs/Groovy3574Bug.groovy | 0
.../test/groovy/bugs/Groovy3590Bug.groovy | 0
.../test/groovy/bugs/Groovy3596Bug.groovy | 0
.../test/groovy/bugs/Groovy3645Bug.groovy | 0
.../test/groovy/bugs/Groovy3658Bug.groovy | 0
.../test/groovy/bugs/Groovy3679Bug.groovy | 0
.../test/groovy/bugs/Groovy3716Bug.groovy | 0
.../test/groovy/bugs/Groovy3718Bug.groovy | 0
.../test/groovy/bugs/Groovy3719Bug.groovy | 0
.../test/groovy/bugs/Groovy3719Bug_script.groovy | 0
.../test/groovy/bugs/Groovy3720Bug.groovy | 0
.../test/groovy/bugs/Groovy3721Bug.groovy | 0
.../test/groovy/bugs/Groovy3723Bug.groovy | 0
.../test/groovy/bugs/Groovy3726Bug.groovy | 0
.../test/groovy/bugs/Groovy3731Bug.groovy | 0
.../test/groovy/bugs/Groovy3749Bug.groovy | 0
.../test/groovy/bugs/Groovy3768Bug.groovy | 0
.../test/groovy/bugs/Groovy3770Bug.groovy | 0
.../test/groovy/bugs/Groovy3776Bug.groovy | 0
.../test/groovy/bugs/Groovy3784Bug.groovy | 0
.../test/groovy/bugs/Groovy3789Bug.groovy | 0
.../test/groovy/bugs/Groovy3799Bug.groovy | 0
.../test/groovy/bugs/Groovy3799Helper.java | 0
.../test/groovy/bugs/Groovy3801Bug.groovy | 0
.../test/groovy/bugs/Groovy3817Bug.groovy | 0
.../test/groovy/bugs/Groovy3818Bug.groovy | 0
.../test/groovy/bugs/Groovy3827Bug.groovy | 0
.../test/groovy/bugs/Groovy3830Bug.groovy | 0
.../test/groovy/bugs/Groovy3831Bug.groovy | 0
.../test/groovy/bugs/Groovy3834Bug.groovy | 0
.../test/groovy/bugs/Groovy3839Bug.groovy | 0
.../test/groovy/bugs/Groovy3852Bug.groovy | 0
.../test/groovy/bugs/Groovy3857Bug.groovy | 0
.../test/groovy/bugs/Groovy3863Bug.groovy | 0
.../test/groovy/bugs/Groovy3868Bug.groovy | 0
.../test/groovy/bugs/Groovy3871Bug.groovy | 0
.../test/groovy/bugs/Groovy3873Bug.groovy | 0
.../test/groovy/bugs/Groovy3876Bug.groovy | 0
.../test/groovy/bugs/Groovy3894Bug.groovy | 0
.../test/groovy/bugs/Groovy389_Bug.groovy | 0
.../test/groovy/bugs/Groovy3904Bug.groovy | 0
.../test/groovy/bugs/Groovy3949Bug.groovy | 0
.../test/groovy/bugs/Groovy3989Bug.groovy | 0
.../test/groovy/bugs/Groovy4006Bug.groovy | 0
.../test/groovy/bugs/Groovy4009Bug.groovy | 0
.../test/groovy/bugs/Groovy4025Bug.groovy | 0
.../test/groovy/bugs/Groovy4029Bug.groovy | 0
.../test/groovy/bugs/Groovy4035Bug.groovy | 0
.../test/groovy/bugs/Groovy4038Bug.groovy | 0
.../test/groovy/bugs/Groovy4043Bug.groovy | 0
.../test/groovy/bugs/Groovy4046Bug.groovy | 0
.../test/groovy/bugs/Groovy4069Bug.groovy | 0
.../test/groovy/bugs/Groovy4075Bug.groovy | 0
.../test/groovy/bugs/Groovy4078Bug.groovy | 0
.../test/groovy/bugs/Groovy4080Bug.groovy | 0
.../test/groovy/bugs/Groovy4081Bug.groovy | 0
.../test/groovy/bugs/Groovy4098Bug.groovy | 0
.../test/groovy/bugs/Groovy4098Child.groovy | 0
.../test/groovy/bugs/Groovy4098Parent.groovy | 0
.../src => src}/test/groovy/bugs/Groovy4104A.java | 0
.../src => src}/test/groovy/bugs/Groovy4104B.java | 0
.../test/groovy/bugs/Groovy4104Bug.groovy | 0
.../test/groovy/bugs/Groovy4106Bug.groovy | 0
.../test/groovy/bugs/Groovy4107Bug.groovy | 0
.../test/groovy/bugs/Groovy4111Bug.groovy | 0
.../test/groovy/bugs/Groovy4116Bug.groovy | 0
.../test/groovy/bugs/Groovy4119Bug.groovy | 0
.../test/groovy/bugs/Groovy4120Bug.groovy | 0
.../test/groovy/bugs/Groovy4121Bug.groovy | 0
.../test/groovy/bugs/Groovy4129Bug.groovy | 0
.../test/groovy/bugs/Groovy4131Bug.groovy | 0
.../test/groovy/bugs/Groovy4133Bug.groovy | 0
.../test/groovy/bugs/Groovy4134Bug.groovy | 0
.../test/groovy/bugs/Groovy4139Bug.groovy | 0
.../src => src}/test/groovy/bugs/Groovy4145.groovy | 0
.../test/groovy/bugs/Groovy4151Bug.groovy | 0
.../test/groovy/bugs/Groovy4169Bug.groovy | 0
.../test/groovy/bugs/Groovy4170Bug.groovy | 0
.../test/groovy/bugs/Groovy4188Bug.groovy | 0
.../test/groovy/bugs/Groovy4190Bug.groovy | 0
.../test/groovy/bugs/Groovy4191Bug.groovy | 0
.../test/groovy/bugs/Groovy4193Bug.groovy | 0
.../test/groovy/bugs/Groovy4202Bug.groovy | 0
.../test/groovy/bugs/Groovy4206Bug.groovy | 0
.../test/groovy/bugs/Groovy4235Bug.groovy | 0
.../test/groovy/bugs/Groovy4241Bug.groovy | 0
.../test/groovy/bugs/Groovy4243Bug.groovy | 0
.../test/groovy/bugs/Groovy4246Bug.groovy | 0
.../test/groovy/bugs/Groovy4247Bug.groovy | 0
.../test/groovy/bugs/Groovy4252Bug.groovy | 0
.../test/groovy/bugs/Groovy4257Bug.groovy | 0
.../test/groovy/bugs/Groovy4264Bug.groovy | 0
.../test/groovy/bugs/Groovy4272Bug.groovy | 0
.../test/groovy/bugs/Groovy4273Bug.groovy | 0
.../test/groovy/bugs/Groovy4293Bug.groovy | 0
.../test/groovy/bugs/Groovy4325Bug.groovy | 0
.../test/groovy/bugs/Groovy4386_Bug.groovy | 0
.../test/groovy/bugs/Groovy4393Bug.groovy | 0
.../test/groovy/bugs/Groovy4393BugV1.foogroovy | 0
.../test/groovy/bugs/Groovy4410Bug.groovy | 0
.../test/groovy/bugs/Groovy4414Bug.groovy | 0
.../test/groovy/bugs/Groovy4415Bug.groovy | 0
.../test/groovy/bugs/Groovy4415BugSupport.java | 0
.../test/groovy/bugs/Groovy4416Bug.groovy | 0
.../test/groovy/bugs/Groovy4418Bug.groovy | 0
.../test/groovy/bugs/Groovy4435Bug.groovy | 0
.../test/groovy/bugs/Groovy4449Bug.groovy | 0
...Groovy4457GenericTypeDeclarationLeakTest.groovy | 0
.../test/groovy/bugs/Groovy4471Bug.groovy | 0
.../test/groovy/bugs/Groovy4480Bug.groovy | 0
.../test/groovy/bugs/Groovy4497Bug.groovy | 0
.../test/groovy/bugs/Groovy4516Bug.groovy | 0
.../test/groovy/bugs/Groovy4584Bug.groovy | 0
.../test/groovy/bugs/Groovy4607Bug.groovy | 0
.../test/groovy/bugs/Groovy4614Bug.groovy | 0
.../test/groovy/bugs/Groovy4720Bug.groovy | 0
.../test/groovy/bugs/Groovy4857Bug.groovy | 0
.../test/groovy/bugs/Groovy4861Bug.groovy | 0
.../test/groovy/bugs/Groovy4922Bug.groovy | 0
.../test/groovy/bugs/Groovy4958Bug.groovy | 0
.../test/groovy/bugs/Groovy4966Bug.groovy | 0
.../test/groovy/bugs/Groovy4967Bug.groovy | 0
.../test/groovy/bugs/Groovy4973Bug.groovy | 0
.../test/groovy/bugs/Groovy4980Bug.groovy | 0
.../test/groovy/bugs/Groovy4986Bug.groovy | 0
.../test/groovy/bugs/Groovy4989Bug.groovy | 0
.../test/groovy/bugs/Groovy4999Bug.groovy | 0
.../test/groovy/bugs/Groovy5025Bug.groovy | 0
.../test/groovy/bugs/Groovy5030Bug.groovy | 0
.../test/groovy/bugs/Groovy5033Bug.groovy | 0
.../test/groovy/bugs/Groovy5056Bug.groovy | 0
.../src => src}/test/groovy/bugs/Groovy5061.groovy | 0
.../test/groovy/bugs/Groovy5101Test.groovy | 0
.../test/groovy/bugs/Groovy5109Bug.groovy | 0
.../test/groovy/bugs/Groovy5122Bug.groovy | 0
.../test/groovy/bugs/Groovy5137Bug.groovy | 0
.../test/groovy/bugs/Groovy513_Bug.groovy | 0
.../test/groovy/bugs/Groovy5150Bug.groovy | 0
.../test/groovy/bugs/Groovy5152Bug.groovy | 0
.../test/groovy/bugs/Groovy5185Bug.groovy | 0
.../test/groovy/bugs/Groovy5193Bug.groovy | 0
.../test/groovy/bugs/Groovy5210Bug.groovy | 0
.../test/groovy/bugs/Groovy5212Bug.groovy | 0
.../test/groovy/bugs/Groovy5259Bug.groovy | 0
.../test/groovy/bugs/Groovy5260Bug.groovy | 0
.../test/groovy/bugs/Groovy5267Bug.groovy | 0
.../test/groovy/bugs/Groovy5272Bug.groovy | 0
.../test/groovy/bugs/Groovy5285Bug.groovy | 0
.../test/groovy/bugs/Groovy5418Bug.groovy | 0
.../test/groovy/bugs/Groovy5425_Bug.groovy | 0
.../test/groovy/bugs/Groovy5572Bug.groovy | 0
.../test/groovy/bugs/Groovy558_616_Bug.groovy | 0
.../test/groovy/bugs/Groovy5687Bug.groovy | 0
.../test/groovy/bugs/Groovy5783Bug.groovy | 0
.../test/groovy/bugs/Groovy5802Bug.groovy | 0
.../test/groovy/bugs/Groovy5806Bug.groovy | 0
.../test/groovy/bugs/Groovy5915Bug.groovy | 0
.../test/groovy/bugs/Groovy596_Bug.groovy | 0
.../test/groovy/bugs/Groovy6041Bug.groovy | 0
.../test/groovy/bugs/Groovy6042Bug.groovy | 0
.../test/groovy/bugs/Groovy6045Bug.groovy | 0
.../test/groovy/bugs/Groovy6072Bug.groovy | 0
.../test/groovy/bugs/Groovy6086Bug.groovy | 0
.../test/groovy/bugs/Groovy6374Bug.groovy | 0
.../test/groovy/bugs/Groovy6508Bug.groovy | 0
.../test/groovy/bugs/Groovy6522Bug.groovy | 0
.../test/groovy/bugs/Groovy662Bug.groovy | 0
.../test/groovy/bugs/Groovy662_JavaClass.java | 0
.../test/groovy/bugs/Groovy666_Bug.groovy | 0
.../test/groovy/bugs/Groovy6722Bug.groovy | 0
.../test/groovy/bugs/Groovy674_Bug.groovy | 0
.../test/groovy/bugs/Groovy6755Bug.groovy | 0
.../test/groovy/bugs/Groovy675_Bug.groovy | 0
.../test/groovy/bugs/Groovy6786Bug.groovy | 0
.../test/groovy/bugs/Groovy6804Bug.groovy | 0
.../test/groovy/bugs/Groovy6808Bug.groovy | 0
.../test/groovy/bugs/Groovy6811Bug.groovy | 0
.../test/groovy/bugs/Groovy6821Bug.groovy | 0
.../test/groovy/bugs/Groovy6830Bug.groovy | 0
.../test/groovy/bugs/Groovy6841Bug.groovy | 0
.../test/groovy/bugs/Groovy7081Bug.groovy | 0
.../test/groovy/bugs/Groovy770_Bug.groovy | 0
.../test/groovy/bugs/Groovy779_Bug.groovy | 0
.../test/groovy/bugs/Groovy831_Bug.groovy | 0
.../test/groovy/bugs/Groovy872Bug.groovy | 0
.../test/groovy/bugs/Groovy965_Bug.groovy | 0
.../test/groovy/bugs/Groovy996_Bug.groovy | 0
.../test/groovy/bugs/GroovyInnerEnumBug.groovy | 0
.../test/groovy/bugs/GuillaumesBug.groovy | 0
.../test/groovy/bugs/GuillaumesMapBug.groovy | 0
.../src => src}/test/groovy/bugs/IanMaceysBug.java | 0
.../groovy/bugs/ImportNodeLineNumberTest.groovy | 0
.../groovy/bugs/InconsistentStackHeightBug.groovy | 0
.../test/groovy/bugs/InterfaceImplBug.groovy | 0
...vokeNormalMethodFromBuilder_Groovy657Bug.groovy | 0
.../groovy/bugs/IterateOverCustomTypeBug.groovy | 0
.../test/groovy/bugs/MarkupAndMethodBug.groovy | 0
.../test/groovy/bugs/MetaClassCachingBug.groovy | 0
...MethodCallWithoutParensInStaticMethodBug.groovy | 0
.../test/groovy/bugs/MethodClosureTest.groovy | 0
.../test/groovy/bugs/MethodDispatchBug.groovy | 0
.../test/groovy/bugs/MethodPointerBug.groovy | 0
.../src => src}/test/groovy/bugs/MorgansBug.groovy | 0
.../test/groovy/bugs/MyConstants4272.java | 0
.../bugs/MyConstantsASTTransformation4272.groovy | 0
.../test/groovy/bugs/NestedClosure2Bug.groovy | 0
.../test/groovy/bugs/NestedClosureBug.groovy | 0
.../groovy/bugs/NullAsBooleanCoercionTest.groovy | 0
.../test/groovy/bugs/NullCompareBug.groovy | 0
.../groovy/bugs/OverloadInvokeMethodBug.groovy | 0
.../test/groovy/bugs/POJOCallSiteBug.groovy | 0
.../test/groovy/bugs/POJOCallSiteBugFoo.java | 0
.../test/groovy/bugs/PrimitivePropertyBug.groovy | 0
.../test/groovy/bugs/PrintlnWithNewBug.groovy | 0
.../test/groovy/bugs/PropertyNameBug.groovy | 0
.../test/groovy/bugs/RodsBooleanBug.groovy | 0
.../src => src}/test/groovy/bugs/RodsBug.groovy | 0
.../groovy/bugs/RussellsOptionalParenTest.groovy | 0
.../src => src}/test/groovy/bugs/ScriptBug.java | 0
.../src => src}/test/groovy/bugs/SeansBug.java | 0
.../src => src}/test/groovy/bugs/SimpleModel.java | 0
.../test/groovy/bugs/SingleEvalTest.groovy | 0
.../groovy/bugs/StaticClosurePropertyBug.groovy | 0
.../test/groovy/bugs/StaticMethodCallBug.groovy | 0
.../test/groovy/bugs/StaticMethodImportBug.groovy | 0
.../bugs/StaticMethodImportGroovy935Bug.groovy | 0
.../test/groovy/bugs/StaticPropertyBug.groovy | 0
.../groovy/bugs/SubscriptAndExpressionBug.groovy | 0
.../bugs/SubscriptOnPrimitiveTypeArrayBug.groovy | 0
.../groovy/bugs/SubscriptOnStringArrayBug.groovy | 0
.../test/groovy/bugs/SuperMethod2Bug.groovy | 0
.../test/groovy/bugs/SuperMethodBug.groovy | 0
.../groovy/bugs/SynchronizedBytecodeBug.groovy | 0
.../test/groovy/bugs/TernaryOperatorTest.groovy | 0
.../src => src}/test/groovy/bugs/TestBase.groovy | 0
.../test/groovy/bugs/TestCaseBug.groovy | 0
.../test/groovy/bugs/TestDerived.groovy | 0
.../src => src}/test/groovy/bugs/TestSupport.java | 0
.../test/groovy/bugs/ToStringBug.groovy | 0
.../test/groovy/bugs/TryCatch2Bug.groovy | 0
.../test/groovy/bugs/TryCatchBug.groovy | 0
.../test/groovy/bugs/UnknownVariableBug.groovy | 0
.../test/groovy/bugs/UseClosureInClosureBug.groovy | 0
.../test/groovy/bugs/UseStaticInClosureBug.groovy | 0
.../test/groovy/bugs/VariablePrecedence.groovy | 0
.../test/groovy/bugs/VariablePrecedenceTest.groovy | 0
.../test/groovy/bugs/VariableScopingBug.groovy | 0
.../test/groovy/bugs/VerifyErrorBug.groovy | 0
.../test/groovy/bugs/WriteOnlyPropertyBug.groovy | 0
.../src => src}/test/groovy/bugs/ZoharsBug.groovy | 0
.../test/groovy/bugs/bug1567_script.groovy | 0
.../test/groovy/execute/ExecuteTest.groovy | 0
.../groovy/execute/ExecuteTest_LinuxSolaris.groovy | 0
.../test/groovy/execute/ExecuteTest_Windows.groovy | 0
.../src => src}/test/groovy/gpath/GPathTest.groovy | 0
.../test/groovy/gpath/NodeGPathTest.groovy | 0
.../groovy/grape/GrabErrorIsolationTest.groovy | 0
.../test/groovy/grape/GrabExcludeTest.groovy | 0
.../test/groovy/grape/GrabResolverTest.groovy | 0
.../test/groovy/grape/GrapeClassLoaderTest.groovy | 0
.../test/groovy/grape/GrapeIvyTest.groovy | 0
.../test/groovy/inspect/InspectorTest.java | 0
.../test/groovy/io/LineColumnReaderTest.groovy | 0
.../test/groovy/io/PlatformLineWriterTest.java | 0
.../test/groovy/io/sample-text-file.txt | 0
.../groovy/lang/BaseScriptCustomBodyMethod.java | 0
.../groovy/lang/BenchmarkInterceptorTest.groovy | 0
.../test/groovy/lang/BigDecimalRangeTest.java | 0
.../test/groovy/lang/BigIntegerRangeTest.java | 0
.../test/groovy/lang/CategoryAnnotationTest.groovy | 0
.../test/groovy/lang/CharacterRangeTest.java | 0
.../test/groovy/lang/ClassReloadingTest.groovy | 0
.../test/groovy/lang/ClosureResolvingTest.groovy | 0
.../groovy/lang/DelegatingMetaClassTest.groovy | 0
.../test/groovy/lang/DerivedScript.java | 0
.../src => src}/test/groovy/lang/DummyGString.java | 0
.../test/groovy/lang/DummyGStringBase.java | 0
.../test/groovy/lang/EmptyRangeTest.java | 0
.../test/groovy/lang/ExceptionTest.groovy | 0
.../lang/ExpandoMetaClassCreationHandleTest.groovy | 0
.../test/groovy/lang/ExpandoMetaClassTest.groovy | 0
.../test/groovy/lang/FloatRangeTest.java | 0
.../src => src}/test/groovy/lang/GStringTest.java | 0
.../test/groovy/lang/GetMethodsTest.groovy | 0
.../test/groovy/lang/Groovy3406Test.groovy | 0
.../test/groovy/lang/GroovyClassLoaderTest.groovy | 0
.../test/groovy/lang/GroovyCodeSourceTest.groovy | 0
.../test/groovy/lang/GroovyShellTest.java | 0
.../test/groovy/lang/GroovyShellTest2.groovy | 0
.../test/groovy/lang/GroovySystemTest.groovy | 0
.../groovy/lang/InnerClassResolvingTest.groovy | 0
.../test/groovy/lang/IntRangeTest.groovy | 0
.../test/groovy/lang/IntegerRangeTest.java | 0
.../test/groovy/lang/InterceptorTest.groovy | 0
.../test/groovy/lang/LongRangeTest.java | 0
.../test/groovy/lang/MapOfClosureTest.groovy | 0
.../test/groovy/lang/MetaClassPropertyTest.groovy | 0
.../test/groovy/lang/MetaClassRegistryTest.groovy | 0
.../test/groovy/lang/MetaClassTest.java | 0
.../test/groovy/lang/MethodMissingTest.groovy | 0
.../test/groovy/lang/MixinAnnotationTest.groovy | 0
.../src => src}/test/groovy/lang/MixinTest.groovy | 0
.../src => src}/test/groovy/lang/MockWriter.java | 0
.../test/groovy/lang/NumberRangeTest.java | 0
.../test/groovy/lang/PropertyMissingTest.groovy | 0
.../src => src}/test/groovy/lang/RangeTest.java | 0
.../groovy/lang/ReferenceSerializationTest.groovy | 0
.../test/groovy/lang/RespondsToTest.groovy | 0
.../test/groovy/lang/ScriptCacheTest.groovy | 0
.../test/groovy/lang/ScriptIntegerDivideTest.java | 0
.../test/groovy/lang/ScriptPrintTest.java | 0
.../lang/ScriptSourcePositionInAstTest.groovy | 0
.../src => src}/test/groovy/lang/ScriptTest.java | 0
.../src => src}/test/groovy/lang/SequenceTest.java | 0
.../test/groovy/lang/ShortRangeTest.java | 0
.../test/groovy/lang/StringConcatTest.groovy | 0
.../test/groovy/lang/StripMarginTest.groovy | 0
.../test/groovy/lang/SyntheticReturnTest.groovy | 0
.../src => src}/test/groovy/lang/TupleTest.java | 0
.../test/groovy/lang/WithMethodTest.groovy | 0
.../groovy/lang/gcldeadlock/DeadlockBugUtil.groovy | 0
.../gcldeadlock/GroovyClassLoaderDeadlockTest.java | 0
.../test/groovy/lang/gcldeadlock/script0.groovy | 0
.../test/groovy/lang/gcldeadlock/script1.groovy | 0
.../test/groovy/mock/example/CheeseSlicer.groovy | 0
.../test/groovy/mock/example/SandwichMaker.groovy | 0
.../groovy/mock/example/SandwichMakerTest.groovy | 0
.../test/groovy/mock/interceptor/Caller.groovy | 0
.../groovy/mock/interceptor/Collaborator.groovy | 0
.../groovy/mock/interceptor/HalfMockTest.groovy | 0
.../groovy/mock/interceptor/IteratorCounter.java | 0
.../mock/interceptor/MockCallSequenceTest.groovy | 0
.../groovy/mock/interceptor/MockForJavaTest.groovy | 0
.../mock/interceptor/MockNestedCallTest.groovy | 0
.../mock/interceptor/MockSingleCallTest.groovy | 0
.../mock/interceptor/MockWithZeroRangeTest.groovy | 0
.../mock/interceptor/StubCallSequenceTest.groovy | 0
.../groovy/mock/interceptor/StubForJavaTest.groovy | 0
.../mock/interceptor/StubSingleCallTest.groovy | 0
.../test/groovy/mock/interceptor/StubTest.groovy | 0
.../groovy/operator/BigDecimalOperatorsTest.groovy | 0
.../operator/BigIntegerOperationsTest.groovy | 0
.../groovy/operator/BitwiseOperatorsTest.groovy | 0
.../groovy/operator/BooleanOperationsTest.groovy | 0
.../groovy/operator/DoubleOperationTest.groovy | 0
.../groovy/operator/IntegerOperatorsTest.groovy | 0
.../test/groovy/operator/MyColor.groovy | 0
.../test/groovy/operator/MyColorCategory.groovy | 0
.../operator/MyColorOperatorOverloadingTest.groovy | 0
.../test/groovy/operator/NegateListsTest.groovy | 0
.../test/groovy/operator/PowerOperatorsTest.groovy | 0
.../groovy/operator/SpreadListOperatorTest.groovy | 0
.../groovy/operator/SpreadMapOperatorTest.groovy | 0
.../groovy/operator/StringOperatorsTest.groovy | 0
.../groovy/operator/TernaryOperatorsTest.groovy | 0
.../groovy/operator/UnaryMinusNumberTests.groovy | 0
.../groovy/operator/UnaryMinusOperatorTest.groovy | 0
.../bugs/CustomMetaClassTestMetaClass.groovy | 0
.../test/groovy/script/CallAnotherScript.groovy | 0
.../test/groovy/script/ClassWithScript.groovy | 0
.../test/groovy/script/EvalInScript.groovy | 0
.../test/groovy/script/HelloWorld.groovy | 0
.../test/groovy/script/HelloWorld2.groovy | 0
.../test/groovy/script/MethodTestScript.groovy | 0
.../test/groovy/script/PackageScript.groovy | 0
.../test/groovy/script/ScriptTest.groovy | 0
.../test/groovy/script/ScriptWithFunctions.groovy | 0
.../src => src}/test/groovy/script/ShowArgs.groovy | 0
.../script/StreamClassloaderInScriptTest.groovy | 0
.../test/groovy/script/UseClosureInScript.groovy | 0
.../test/groovy/security/RunOneGroovyScript.java | 0
.../test/groovy/security/SecurityTest.java | 0
.../test/groovy/security/SecurityTestSupport.java | 0
.../test/groovy/security/SignedJarTest.java | 0
.../test/groovy/security/forbiddenCodeBase.gvy | 0
.../test/groovy/time/DurationTest.groovy | 0
.../test/groovy/time/TimeCategoryTest.groovy | 0
.../transform/AnnotationCollectorTest.groovy | 0
.../transform/ConditionalInterruptTest.groovy | 0
.../test/groovy/transform/LazyTest.groovy | 0
.../test/groovy/transform/ReadWriteLockTest.groovy | 0
.../groovy/transform/ThreadInterruptTest.groovy | 0
.../groovy/transform/TimedInterruptTest.groovy | 0
.../stc/AnonymousInnerClassSTCTest.groovy | 0
.../stc/ArraysAndCollectionsSTCTest.groovy | 0
.../test/groovy/transform/stc/BugsSTCTest.groovy | 0
.../groovy/transform/stc/CategoriesSTCTest.groovy | 0
.../stc/ClosureParamTypeInferenceSTCTest.groovy | 1222 ++++++++++++++++++++
.../groovy/transform/stc/ClosuresSTCTest.groovy | 0
.../groovy/transform/stc/CoercionSTCTest.groovy | 0
.../transform/stc/ConstructorsSTCTest.groovy | 0
.../stc/CustomErrorCollectorSTCTest.groovy | 0
.../stc/DefaultGroovyMethodsSTCTest.groovy | 0
.../groovy/transform/stc/DelegatesToSTCTest.groovy | 0
.../stc/FieldsAndPropertiesSTCTest.groovy | 0
.../groovy/transform/stc/GenericsSTCTest.groovy | 0
.../test/groovy/transform/stc/Groovy7184Bug.groovy | 0
.../IOGMClosureParamTypeInferenceSTCTest.groovy | 0
.../test/groovy/transform/stc/LoopsSTCTest.groovy | 0
.../groovy/transform/stc/MethodCallsSTCTest.groovy | 0
.../test/groovy/transform/stc/MiscSTCTest.groovy | 0
.../test/groovy/transform/stc/MyBean.java | 0
.../test/groovy/transform/stc/MyType.java | 0
.../transform/stc/PrecompiledExtension.groovy | 0
.../stc/PrecompiledExtensionNotExtendingDSL.groovy | 0
.../test/groovy/transform/stc/RangesSTCTest.groovy | 0
...sourceGMClosureParamTypeInferenceSTCTest.groovy | 0
.../groovy/transform/stc/ReturnsSTCTest.groovy | 0
.../groovy/transform/stc/STCAssignmentTest.groovy | 0
.../transform/stc/STCExtensionMethodsTest.groovy | 0
.../transform/stc/STCnAryExpressionTest.groovy | 0
.../stc/STCwithTransformationsTest.groovy | 0
...SocketGMClosureParamTypeInferenceSTCTest.groovy | 0
.../stc/StaticTypeCheckingTestCase.groovy | 0
...StringGMClosureParamTypeInferenceSTCTest.groovy | 0
.../transform/stc/TernaryOperatorSTCTest.groovy | 0
.../stc/TypeCheckingExtensionsTest.groovy | 0
.../transform/stc/TypeCheckingModeTest.groovy | 0
.../transform/stc/TypeInferenceSTCTest.groovy | 0
.../transform/stc/UnaryOperatorSTCTest.groovy | 0
.../test/groovy/transform/stc/WithSTCTest.groovy | 0
.../test/groovy/transform/stc/package.html | 0
.../transform/stc/vm6/MethodCallsSTCTest.groovy | 0
.../test/groovy/tree/ClosureClassLoaderBug.groovy | 0
.../test/groovy/tree/NavigationTest.groovy | 0
.../test/groovy/tree/NestedClosureBugTest.groovy | 0
.../test/groovy/tree/NodePrinterTest.java | 0
.../test/groovy/tree/SmallTreeTest.groovy | 0
.../src => src}/test/groovy/tree/TreeTest.groovy | 0
.../test/groovy/tree/VerboseTreeTest.groovy | 0
.../test/groovy/txn/TransactionBean.java | 0
.../test/groovy/txn/TransactionBuilder.java | 0
.../test/groovy/txn/TransactionTest.groovy | 0
.../test/groovy/ui/GroovyMainTest.groovy | 0
.../test/groovy/util/BuilderSupportTest.groovy | 0
.../test/groovy/util/CliBuilderTest.groovy | 0
.../test/groovy/util/ConfigObjectTest.groovy | 0
.../test/groovy/util/ConfigSlurperTest.groovy | 0
.../test/groovy/util/DelegatingScriptTest.groovy | 0
.../src => src}/test/groovy/util/EvalTest.java | 0
.../groovy/util/FactoryBuilderSupportTest.groovy | 0
.../test/groovy/util/FileTreeBuilderTest.groovy | 0
.../util/GroovyCollectionsStarImportTest.groovy | 0
.../test/groovy/util/GroovyCollectionsTest.groovy | 0
.../util/GroovyScriptEngineReloadingTest.groovy | 0
.../test/groovy/util/HeadlessTestSupport.groovy | 0
.../test/groovy/util/IndentPrinterTest.groovy | 0
.../util/JavadocAssertionTestBuilderTest.groovy | 0
.../test/groovy/util/MiscScriptTest.groovy | 0
.../src => src}/test/groovy/util/NodeTest.groovy | 0
.../test/groovy/util/ObjectGraphBuilderTest.groovy | 0
.../test/groovy/util/ObservableListTest.groovy | 0
.../test/groovy/util/ObservableMapTest.groovy | 0
.../test/groovy/util/ObservableSetTests.groovy | 0
.../test/groovy/util/OrderByTest.groovy | 0
.../groovy/util/ProxyGeneratorAdapterTest.groovy | 0
.../test/groovy/util/ProxyGeneratorTest.groovy | 0
.../src => src}/test/groovy/util/ProxyTest.groovy | 0
.../test/groovy/util/ResourceBundleTest.groovy | 0
.../src => src}/test/groovy/util/i18n.properties | 0
.../test/groovy/util/i18n_en.properties | 0
.../test/groovy/util/i18n_fr.properties | 0
.../test/groovy/util/logging/CommonsTest.groovy | 0
.../test/groovy/util/logging/Log4j2Test.groovy | 0
.../test/groovy/util/logging/Log4jTest.groovy | 0
.../test/groovy/util/logging/LogTest.groovy | 0
.../test/groovy/util/logging/Slf4jTest.groovy | 0
.../src => src}/test/groovy/util/system.properties | 0
.../src => src}/test/groovy/xml/XmlAssert.java | 0
.../src => src}/test/indy/IndyUsageTest.groovy | 0
.../ClosureAndInnerClassNodeStructureTest.groovy | 0
.../groovy/antlr/AnnotationSourceParsingTest.java | 0
.../groovy/antlr/AntlrParserPluginTest.groovy | 0
.../groovy/antlr/EnumSourceParsingTest.java | 0
.../codehaus/groovy/antlr/GStringEndTest.groovy | 0
.../codehaus/groovy/antlr/GroovySourceASTTest.java | 0
.../codehaus/groovy/antlr/SourceBufferTest.java | 0
.../codehaus/groovy/antlr/SourceParserTest.java | 0
.../antlr/treewalker/CompositeVisitorTest.java | 0
.../groovy/antlr/treewalker/Java2GroovyTest.java | 0
.../groovy/antlr/treewalker/LineColumnChecker.java | 0
.../groovy/antlr/treewalker/LineColumnTest.java | 0
.../antlr/treewalker/MindMapPrinterTest.java | 0
.../antlr/treewalker/NodeAsHTMLPrinterTest.java | 0
.../groovy/antlr/treewalker/NodePrinterTest.java | 0
.../groovy/antlr/treewalker/SourcePrinterTest.java | 0
.../antlr/treewalker/TraversalTestHelper.java | 0
.../antlr/treewalker/UnimplementedSyntaxTest.java | 0
.../test/org/codehaus/groovy/ast/ASTTest.java | 0
.../org/codehaus/groovy/ast/ClassNodeTest.java | 0
.../groovy/ast/CodeVisitorSupportTest.groovy | 0
.../codehaus/groovy/ast/GenericsTestCase.groovy | 0
.../codehaus/groovy/ast/GenericsTypeTest.groovy | 0
.../groovy/ast/LazyInitOnClassNodeTest.groovy | 0
.../org/codehaus/groovy/ast/LineColumnCheck.txt | 0
.../org/codehaus/groovy/ast/LineColumnChecker.java | 0
.../groovy/ast/MethodCallExpressionTest.java | 0
.../org/codehaus/groovy/ast/MethodNodeTest.groovy | 0
.../org/codehaus/groovy/ast/ModuleNodeTest.java | 0
.../groovy/ast/VariableExpressionTest.java | 0
.../codehaus/groovy/ast/builder/AstAssert.groovy | 0
.../ast/builder/AstBuilderFromCodeTest.groovy | 0
.../builder/AstBuilderFromSpecificationTest.groovy | 0
.../ast/builder/AstBuilderFromStringTest.groovy | 0
.../groovy/ast/builder/WithAstBuilder.groovy | 0
.../AstBuilderFromCodePackageImportTest.groovy | 0
.../groovy/ast/expr/ClosureExpressionTest.groovy | 0
.../groovy/ast/expr/MapExpressionTest.groovy | 0
.../ast/expr/MethodCallExpressionTest.groovy | 0
.../groovy/ast/expr/PropertyExpressionTest.groovy | 0
.../groovy/ast/source/Groovy3049Test.groovy | 0
.../groovy/ast/source/Groovy3050Test.groovy | 0
.../groovy/ast/source/Groovy3051Test.groovy | 0
.../groovy/ast/source/SourceBaseTestCase.groovy | 0
.../groovy/ast/tools/WideningCategoriesTest.groovy | 0
.../groovy/benchmarks/alioth/binarytrees.groovy | 0
.../groovy/benchmarks/alioth/fannkuch.groovy | 0
.../groovy/benchmarks/alioth/partialsums.groovy | 0
.../groovy/benchmarks/alioth/rayTracer.groovy | 0
.../groovy/benchmarks/alioth/recursive.groovy | 0
.../groovy/benchmarks/alioth/spectralnorm.groovy | 0
.../groovy/benchmarks/vm5/b2394/Builder.java | 0
.../codehaus/groovy/benchmarks/vm5/b2394/Main.java | 0
.../benchmarks/vm5/b2394/ScriptLauncher.java | 0
.../groovy/benchmarks/vm5/b2394/script120.groovy | 0
.../groovy/benchmarks/vm5/b2394/script240.groovy | 0
.../groovy/benchmarks/vm5/b2394/script30.groovy | 0
.../groovy/benchmarks/vm5/b2394/script300.groovy | 0
.../vm5/b2394/script300WithCategory.groovy | 0
.../groovy/benchmarks/vm5/b2394/script60.groovy | 0
.../org/codehaus/groovy/benchmarks/vm5/psum.java | 0
.../groovy/benchmarks/vm5/spectralnorm.java | 0
.../groovy/classgen/BytecodeHelperTest.groovy | 0
.../classgen/CallClosureFieldAsMethodTest.groovy | 0
.../codehaus/groovy/classgen/CallSiteTest.groovy | 0
.../codehaus/groovy/classgen/CapitalizeTest.java | 0
.../org/codehaus/groovy/classgen/CastTest.groovy | 0
.../classgen/ClassCompletionVerifierTest.java | 0
.../groovy/classgen/ConstructorIssueTest.groovy | 0
.../codehaus/groovy/classgen/ConstructorTest.java | 0
.../org/codehaus/groovy/classgen/DerivedBean.java | 0
.../codehaus/groovy/classgen/DummyReflector.java | 0
.../groovy/classgen/DummyTestDerivation.java | 0
.../groovy/classgen/DumpingClassLoader.java | 0
.../test/org/codehaus/groovy/classgen/ForTest.java | 0
.../org/codehaus/groovy/classgen/GStringTest.java | 0
.../groovy/classgen/GenericsGenTest.groovy | 0
.../codehaus/groovy/classgen/GetPropertyTest.java | 0
.../groovy/classgen/GroovyClassLoaderTest.java | 0
.../org/codehaus/groovy/classgen/IfElseTest.java | 0
.../codehaus/groovy/classgen/InterfaceTest.groovy | 0
.../test/org/codehaus/groovy/classgen/JO.java | 0
.../test/org/codehaus/groovy/classgen/Main.groovy | 0
.../org/codehaus/groovy/classgen/MainTest.java | 0
.../codehaus/groovy/classgen/MetaClassTest.groovy | 0
.../org/codehaus/groovy/classgen/MethodTest.java | 0
.../org/codehaus/groovy/classgen/MyBean.groovy | 0
.../org/codehaus/groovy/classgen/PropertyTest.java | 0
.../groovy/classgen/ReflectorGeneratorTest.java | 0
.../groovy/classgen/ReflectorLoaderTest.groovy | 0
.../org/codehaus/groovy/classgen/RunBugsTest.java | 0
.../codehaus/groovy/classgen/RunClosureTest.java | 0
.../codehaus/groovy/classgen/RunGroovyTest.java | 0
.../org/codehaus/groovy/classgen/SimpleBean.java | 0
.../org/codehaus/groovy/classgen/TestSupport.java | 0
.../codehaus/groovy/classgen/TupleListTest.java | 0
.../groovy/classgen/VerifierCodeVisitorTest.java | 0
.../classgen/asm/AbstractBytecodeTestCase.groovy | 0
.../classgen/asm/BinaryOperationsTest.groovy | 0
.../asm/CovariantReturnBytecodeTest.groovy | 0
.../classgen/asm/DirectMethodCallTest.groovy | 0
.../groovy/classgen/asm/HotSwapTest.groovy | 0
.../asm/InstructionSequenceHelperClassTest.groovy | 0
.../groovy/classgen/asm/MethodPatternsTest.groovy | 0
.../classgen/asm/PrintlnLoadsAConstantTest.groovy | 0
.../sc/AnonymousInnerClassStaticCompileTest.groovy | 0
.../ArraysAndCollectionsStaticCompileTest.groovy | 0
.../asm/sc/AssignmentsStaticCompileTest.groovy | 0
.../classgen/asm/sc/BugsStaticCompileTest.groovy | 0
...sureParamTypeInferrenceStaticCompileTest.groovy | 0
.../asm/sc/ClosuresStaticCompileTest.groovy | 0
.../sc/CompatWithASTXFormStaticCompileTest.groovy | 0
.../classgen/asm/sc/CompileDynamicTest.groovy | 0
.../asm/sc/DelegatesToStaticCompileTest.groovy | 0
.../sc/FieldsAndPropertiesStaticCompileTest.groovy | 0
.../asm/sc/GenericsStaticCompileTest.groovy | 0
.../asm/sc/GetAnnotationStaticCompileTest.groovy | 0
.../groovy/classgen/asm/sc/Groovy6924Support.java | 0
.../groovy/classgen/asm/sc/Groovy6955Support.java | 0
.../asm/sc/Groovy7222OptimizationsTest.groovy | 0
...sureParamTypeInferrenceStaticCompileTest.groovy | 0
.../classgen/asm/sc/LoopsStaticCompileTest.groovy | 0
.../asm/sc/MethodCallsStaticCompilationTest.groovy | 0
.../classgen/asm/sc/MiscStaticCompileTest.groovy | 0
.../asm/sc/MixedModeStaticCompilationTest.groovy | 0
.../sc/NaryExpressionTestStaticCompileTest.groovy | 0
.../classgen/asm/sc/RangesStaticCompileTest.groovy | 0
...sureParamTypeInferrenceStaticCompileTest.groovy | 0
.../asm/sc/ReturnsStaticCompileTest.groovy | 0
...sureParamTypeInferrenceStaticCompileTest.groovy | 0
.../classgen/asm/sc/StaticCompilationTest.groovy | 0
.../asm/sc/StaticCompilationTestSupport.groovy | 0
.../asm/sc/StaticCompileArrayLengthAndGet.groovy | 0
.../sc/StaticCompileCastOptimizationTest.groovy | 0
.../asm/sc/StaticCompileClosureCallTest.groovy | 0
.../asm/sc/StaticCompileComparisonTest.groovy | 0
.../asm/sc/StaticCompileConstructorsTest.groovy | 0
.../asm/sc/StaticCompileDGMMethodTest.groovy | 0
.../classgen/asm/sc/StaticCompileDGMTest.groovy | 0
.../asm/sc/StaticCompileFieldAccessTest.groovy | 0
.../asm/sc/StaticCompileFlowTypingTest.groovy | 0
.../asm/sc/StaticCompileInnerClassTest.groovy | 0
.../classgen/asm/sc/StaticCompileMathTest.groovy | 0
...StaticCompileNullCompareOptimizationTest.groovy | 0
.../asm/sc/StaticCompilePostfixPrefixTest.groovy | 0
...sureParamTypeInferrenceStaticCompileTest.groovy | 0
.../TupleConstructorStaticCompilationTest.groovy | 0
.../sc/TypeCheckingModeStaticCompileTest.groovy | 0
.../asm/sc/TypeInferenceStaticCompileTest.groovy | 0
.../asm/sc/UnaryOperatorStaticCompileTest.groovy | 0
.../classgen/asm/sc/WithStaticCompileTest.groovy | 0
.../classgen/asm/sc/bugs/Groovy6240Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6276Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6411Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6475Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6533Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6541Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6558Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6564Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6568Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6627Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6650Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6657Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6670Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6671Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6676Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6693Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6724Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6733Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6757Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6782Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy6962Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7039Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7041Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7042Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7072Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7075Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7093Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7098Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7133Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7138Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7145Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7149Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7169Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7210Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7211Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7242Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7276Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7298Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7300Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7307Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7316Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7322Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7324Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7325Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7327Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7333Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7343Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7355Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7356Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7357Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7358Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7361Bug.groovy | 0
.../classgen/asm/sc/bugs/Groovy7364Bug.groovy | 0
.../asm/sc/bugs/support/Groovy6962Base.java | 0
.../asm/sc/bugs/support/Groovy6962Ext.java | 0
.../asm/sc/bugs/support/Groovy7133Support.java | 0
.../classgen/asm/sc/support/Groovy6235Support.java | 0
.../asm/sc/support/Groovy6235SupportSub.java | 0
.../sc/vm6/MethodCallsStaticCompilationTest.groovy | 0
.../groovy/control/CompilationUnitTest.java | 0
.../groovy/control/CompilerConfigurationTest.java | 0
.../ASTTransformationCustomizerTest.groovy | 0
.../customizers/ImportCustomizerTest.groovy | 0
.../customizers/SecureASTCustomizerTest.groovy | 0
.../CompilerCustomizationBuilderTest.groovy | 0
.../control/io/AbstractReaderSourceTest.java | 0
.../groovy/control/io/FileReaderTest.groovy | 0
.../groovy/control/io/NullWriterTest.groovy | 0
.../control/io/StringReaderSourceTest.groovy | 0
.../control/messages/SyntaxErrorMessageTest.java | 0
.../groovy/dummy/ClassWithStaticMethod.groovy | 0
.../test/org/codehaus/groovy/dummy/FooHandler.java | 0
.../reflection/GroovyClassValueFactoryTest.groovy | 0
.../codehaus/groovy/reflection/WeakMapTest.groovy | 0
.../reflection/utils/PojoCallerTestClass.java | 0
.../reflection/utils/ReflectionUtilsTest.groovy | 0
.../groovy/runtime/AppendableDgmMethodsTest.groovy | 0
.../groovy/runtime/CategoryForIteratorTest.groovy | 0
.../runtime/CustomBooleanCoercionTest.groovy | 0
.../org/codehaus/groovy/runtime/DateGDKTest.groovy | 0
.../groovy/runtime/DefaultGroovyMethodsTest.groovy | 0
.../runtime/DefaultGroovyStaticMethodsTest.java | 0
.../groovy/runtime/DirectoryDeleteTest.groovy | 0
.../org/codehaus/groovy/runtime/DummyBean.java | 0
.../codehaus/groovy/runtime/EachLineTest.groovy | 0
.../EachWithReaderAndInputStreamTest.groovy | 0
.../codehaus/groovy/runtime/FileAppendTest.groovy | 0
.../groovy/runtime/FileLeftShiftTest.groovy | 0
.../runtime/FileStaticGroovyMethodsTest.groovy | 0
.../groovy/runtime/GroovyCategoryTest.groovy | 0
.../runtime/InheritedInterfaceMethodTest.java | 0
.../groovy/runtime/InterfaceConversionTest.groovy | 0
.../groovy/runtime/InvokeConstructorTest.java | 0
.../groovy/runtime/InvokeGroovyMethodTest.java | 0
.../codehaus/groovy/runtime/InvokeMethodTest.java | 0
.../codehaus/groovy/runtime/InvokerHelperTest.java | 0
.../org/codehaus/groovy/runtime/InvokerTest.java | 0
.../runtime/JdkDynamicProxyInvocationHandler.java | 0
.../groovy/runtime/JdkDynamicProxyServiceBean.java | 0
.../runtime/JdkDynamicProxyServiceBeanImpl1.groovy | 0
.../runtime/JdkDynamicProxyServiceBeanImpl2.groovy | 0
.../groovy/runtime/JdkDynamicProxyTest.java | 0
.../groovy/runtime/MetaClassHelperTest.java | 0
.../codehaus/groovy/runtime/MethodFailureTest.java | 0
.../org/codehaus/groovy/runtime/MethodKeyTest.java | 0
.../groovy/runtime/MethodRankHelperTest.java | 0
.../org/codehaus/groovy/runtime/MinusTest.groovy | 0
.../codehaus/groovy/runtime/MockGroovyObject.java | 0
.../groovy/runtime/NestedCategoryTest.groovy | 0
.../groovy/runtime/NewStaticMetaMethodTest.java | 0
.../codehaus/groovy/runtime/NullObjectTest.groovy | 0
.../groovy/runtime/PerInstanceMetaClassTest.groovy | 0
.../org/codehaus/groovy/runtime/PropertyTest.java | 0
.../runtime/ResourceGroovyMethodsTest.groovy | 0
.../codehaus/groovy/runtime/StaticInitTest.java | 0
.../groovy/runtime/StaticPrintlnTest.groovy | 0
.../groovy/runtime/StringAsClassTest.groovy | 0
.../groovy/runtime/StringGroovyMethodsTest.java | 0
.../org/codehaus/groovy/runtime/TupleListTest.java | 0
.../codehaus/groovy/runtime/URLGetTextTest.groovy | 0
.../runtime/WithResourceStreamClosedTest.groovy | 0
.../groovy/runtime/WriterAppendTest.groovy | 0
.../m12n/ExtensionModuleHelperForTests.groovy | 0
.../groovy/runtime/m12n/ExtensionModuleTest.groovy | 0
.../groovy/runtime/m12n/Groovy6496Extension.java | 0
.../runtime/m12n/TestStaticStringExtension.java | 0
.../groovy/runtime/m12n/TestStringExtension.java | 0
.../runtime/memoize/AbstractMemoizeTestCase.groovy | 0
.../CacheCleanupCollectedSoftReferencesTest.groovy | 0
.../groovy/runtime/memoize/CacheCleanupTest.groovy | 0
.../memoize/LRUProtectionStorageTest.groovy | 0
.../runtime/memoize/MemoizeAtLeastTest.groovy | 0
.../runtime/memoize/MemoizeAtMostTest.groovy | 0
.../runtime/memoize/MemoizeBetweenTest.groovy | 0
.../groovy/runtime/memoize/MemoizeTest.groovy | 0
.../groovy/runtime/memoize/NullValueTest.groovy | 0
.../powerassert/AssertionRenderingTest.groovy | 0
.../runtime/powerassert/AssertionTestUtil.groovy | 0
.../AssertionsInDifferentLocationsTest.groovy | 0
.../runtime/powerassert/EvaluationTest.groovy | 0
.../ImplicitClosureCallRenderingTest.groovy | 0
.../NotTransformedAssertionsTest.groovy | 0
.../PowerAssertASTTransformationTest.groovy | 0
.../powerassert/ScriptEvaluationTest.groovy | 0
.../runtime/powerassert/ValueRenderingTest.groovy | 0
.../runtime/trampoline/TrampolineTest.groovy | 0
.../test/org/codehaus/groovy/syntax/TokenTest.java | 0
.../groovy/syntax/parser/TestParserSupport.java | 0
.../org/codehaus/groovy/tools/CompilerTest.java | 0
.../codehaus/groovy/tools/DocGeneratorMain.java | 0
.../groovy/tools/FileSystemCompilerTest.java | 0
.../groovy/tools/LoaderConfigurationTest.groovy | 0
.../codehaus/groovy/tools/MetaBuilderTest.groovy | 0
.../codehaus/groovy/tools/StringHelperTest.groovy | 0
.../codehaus/groovy/tools/TestDgmConverter.java | 0
.../org/codehaus/groovy/tools/UtilitiesTest.groovy | 0
.../tools/ast/TransformTestHelperTest.groovy | 0
.../codehaus/groovy/tools/gse/DependencyTest.java | 0
.../AbstractGenericGroovySuperclass.groovy | 0
.../rootloadersync/AbstractGroovySuperclass.groovy | 0
.../ConcreteGenericJavaSubclass.java | 0
.../tools/rootloadersync/ConcreteJavaSubclass.java | 0
.../OtherConcreteGenericJavaSubclass.java | 0
.../rootloadersync/OtherConcreteJavaSubclass.java | 0
.../rootloadersync/SubclassingInGroovyTest.groovy | 0
.../rootloadersync/SubclassingInJavaTest.java | 0
.../AnnotationCollectorStubTest.groovy | 0
.../AnnotationDefaultValuesStubTest.groovy | 0
...otationMemberValuesResolutionV1StubsTest.groovy | 0
...otationMemberValuesResolutionV2StubsTest.groovy | 0
...otationMemberValuesResolutionV3StubsTest.groovy | 0
...otationMemberValuesResolutionV4StubsTest.groovy | 0
.../ArrayAnnotationsShouldAppearInStubsTest.groovy | 0
...adGenericsExpansionOnInnerClassStubsTest.groovy | 0
.../CircularLanguageReferenceTest.groovy | 0
...alueReturnTypeShouldUseGenericsStubsTest.groovy | 0
.../DuplicateMethodAdditionInStubsTest.groovy | 0
.../EnsureClassAnnotationPresentInStubTest.groovy | 0
.../EscapingOfStringAnnotationValuesTest.groovy | 0
.../ExceptionThrowingSuperConstructorTest.groovy | 0
.../GenericsTypesHavePackageNamesStubTest.groovy | 0
.../GenericsWithExtendsStubTest.groovy | 0
.../tools/stubgenerator/Groovy4248Bug.groovy | 0
.../tools/stubgenerator/Groovy5859Bug.groovy | 0
.../tools/stubgenerator/Groovy5859Support.java | 0
.../tools/stubgenerator/Groovy6302Bug.groovy | 0
.../tools/stubgenerator/Groovy6404Bug.groovy | 0
.../tools/stubgenerator/Groovy6617Bug.groovy | 0
.../tools/stubgenerator/Groovy6855Bug.groovy | 0
.../tools/stubgenerator/Groovy7052Bug.groovy | 0
.../tools/stubgenerator/Groovy7113Bug.groovy | 0
...leWithJointCompilationGroovy6836StubTest.groovy | 0
.../ImmutableWithJointCompilationStubTest.groovy | 0
.../ImportAliasesShouldNotAppearInStubsTest.groovy | 0
.../stubgenerator/InnerAnnotationStubTest.groovy | 0
.../InterfaceWithPrimitiveFieldsTest.groovy | 0
.../stubgenerator/MultilineStringStubTest.groovy | 0
.../NestedGenericsTypesStubTest.groovy | 0
...icGetMetaClassSyntheticMethodInStubsTest.groovy | 0
.../stubgenerator/PropertyUsageFromJavaTest.groovy | 0
...WithCustomSetterHavingReturnTypeStubTest.groovy | 0
.../groovy/tools/stubgenerator/QDoxCategory.groovy | 0
.../stubgenerator/RedundantCastInStubTest.groovy | 0
.../stubgenerator/StringSourcesStubTestCase.groovy | 0
.../StubGenerationForAnAnnotationStubsTest.groovy | 0
...nForConstructorWithOptionalArgsStubsTest.groovy | 0
.../groovy/tools/stubgenerator/StubTestCase.groovy | 0
.../UnAmbigousSuperConstructorCallStubsTest.groovy | 0
.../VarargsMethodParamsStubTest.groovy | 0
...stForGenericReturnValueOfMethodStubsTest.groovy | 0
.../transform/BaseScriptTransformTest.groovy | 0
.../groovy/transform/BuilderTransformTest.groovy | 0
.../CanonicalComponentsTransformTest.groovy | 0
.../groovy/transform/CanonicalTransformTest.groovy | 0
.../ClassImplementingANonPublicInterface.java | 0
.../groovy/transform/DelegateTransformTest.groovy | 0
.../groovy/transform/FakeURLFactory.groovy | 0
.../groovy/transform/FieldTransformTest.groovy | 0
.../GlobalTestTransformClassLoader.groovy | 0
.../groovy/transform/GlobalTransformTest.groovy | 0
.../groovy/transform/ImmutableTransformTest.groovy | 0
.../transform/IndexedPropertyTransformTest.groovy | 0
.../InheritConstructorsTransformTest.groovy | 0
.../groovy/transform/LazyTransformTest.groovy | 0
.../groovy/transform/LocalASTTransformTest.groovy | 0
...org.codehaus.groovy.transform.ASTTransformation | 0
.../transform/MemoizedASTTransformationTest.groovy | 0
.../groovy/transform/NewifyTransformTest.groovy | 0
.../groovy/transform/NonPublicInterface.java | 0
.../transform/PackageScopeTransformTest.groovy | 0
.../transform/ReadWriteLockTransformTest.groovy | 0
.../transform/SingletonASTTransformationTest.java | 0
.../groovy/transform/SingletonTransformTest.groovy | 0
.../groovy/transform/SortableTransformTest.groovy | 0
.../groovy/transform/SourceURITransformTest.groovy | 0
.../transform/SynchronizedTransformTest.groovy | 0
.../codehaus/groovy/transform/TestTransform.groovy | 0
.../groovy/transform/ToStringTransformTest.groovy | 0
.../TransformsAndCustomClassLoadersTest.groovy | 0
.../groovy/transform/stc/SignatureCodecTest.groovy | 0
.../tailrec/InWhileLoopWrapperTest.groovy | 0
.../transform/tailrec/ParameterMappingTest.groovy | 0
.../transform/tailrec/RecursiveListExamples.groovy | 0
.../tailrec/RecursivenessTesterTest.groovy | 0
.../tailrec/ReturnAdderForClosuresTest.groovy | 0
.../ReturnStatementToIterationConverterTest.groovy | 0
.../transform/tailrec/StatementReplacerTest.groovy | 0
.../TailRecursiveCompilationFailuresTest.groovy | 0
.../transform/tailrec/TailRecursiveExamples.groovy | 0
.../TailRecursiveTogetherWithOtherASTsTest.groovy | 0
.../tailrec/TailRecursiveTransformationTest.groovy | 0
.../TernaryToIfStatementConverterTest.groovy | 0
.../tailrec/VariableExpressionReplacerTest.groovy | 0
.../groovy/transform/traitx/Groovy6697Bug.groovy | 0
.../groovy/transform/traitx/Groovy6736Bug.groovy | 0
.../groovy/transform/traitx/Groovy6741Bug.groovy | 0
.../groovy/transform/traitx/Groovy7011Bug.groovy | 0
.../groovy/transform/traitx/Groovy7190Bug.groovy | 0
.../groovy/transform/traitx/Groovy7196Bug.groovy | 0
.../transform/traitx/Groovy7196SupportTrait.groovy | 0
.../traitx/Groovy7196SupportTraitImpl.groovy | 0
.../groovy/transform/traitx/Groovy7206Bug.groovy | 0
.../groovy/transform/traitx/Groovy7213Bug.groovy | 0
.../groovy/transform/traitx/Groovy7214Bug.groovy | 0
.../groovy/transform/traitx/Groovy7215Bug.groovy | 0
.../transform/traitx/Groovy7215SupportTrait.groovy | 0
.../groovy/transform/traitx/Groovy7217Bug.groovy | 0
.../groovy/transform/traitx/Groovy7255Bug.groovy | 0
.../groovy/transform/traitx/Groovy7269Bug.groovy | 0
.../groovy/transform/traitx/Groovy7275Bug.groovy | 0
.../groovy/transform/traitx/Groovy7285Bug.groovy | 0
.../groovy/transform/traitx/TestTrait2.groovy | 0
.../traitx/TraitASTTransformationTest.groovy | 0
.../codehaus/groovy/util/ListHashMapTest.groovy | 0
.../groovy/util/ManagedLinkedlistTest.groovy | 0
.../groovy-ant/build.gradle | 0
.../main/groovy/groovy/util/FileNameFinder.groovy | 0
.../src/main/java/groovy/util/AntBuilder.java | 0
.../groovy/ant/AntProjectPropertiesDelegate.java | 0
.../codehaus/groovy/ant/CompileTaskSupport.java | 0
.../java/org/codehaus/groovy/ant/FileIterator.java | 0
.../java/org/codehaus/groovy/ant/FileScanner.java | 0
.../groovy/ant/FileSystemCompilerFacade.java | 0
.../org/codehaus/groovy/ant/GenerateStubsTask.java | 0
.../main/java/org/codehaus/groovy/ant/Groovy.java | 0
.../main/java/org/codehaus/groovy/ant/Groovyc.java | 0
.../java/org/codehaus/groovy/ant/GroovycTask.java | 0
.../java/org/codehaus/groovy/ant/Groovydoc.java | 0
.../org/codehaus/groovy/ant/LoggingHelper.java | 0
.../org/codehaus/groovy/ant/RootLoaderRef.java | 0
.../org/codehaus/groovy/ant/UberCompileTask.java | 0
.../java/org/codehaus/groovy/ant/VerifyClass.java | 0
.../main/java/org/codehaus/groovy/ant/package.html | 0
.../main/resources/org/codehaus/groovy/antlib.xml | 0
.../groovy-ant/src/spec/doc/ant-builder.adoc | 0
.../groovy-ant/src/spec/test/AntBuilderTest.groovy | 0
.../spec/test/builder/AntBuilderSpecTest.groovy | 0
.../src/test-resources/groovy/util/AntTest.xml | 0
.../test-resources/groovy/util/AntTest_import.xml | 0
.../org/codehaus/groovy/ant/GroovyTest.xml | 0
.../org/codehaus/groovy/ant/GroovyTest1.groovy | 0
.../org/codehaus/groovy/ant/GroovyTest2.groovy | 0
.../groovy/ant/GroovyTest_errorMessage.groovy | 0
.../org/codehaus/groovy/ant/GroovycTest.xml | 0
.../org/codehaus/groovy/ant/GroovycTest1.groovy | 0
.../org/codehaus/groovy/ant/GroovycTest2.java | 0
.../groovy/ant/IncorrectGenericsUsage.java | 0
.../groovy/ant/groovytest3/GroovyTest3Class.groovy | 0
.../src/test/groovy/groovy/util/AntTest.groovy | 0
.../groovy/groovy/util/FileNameFinderTest.groovy | 0
.../src/test/groovy/groovy/util/SpoofTask.java | 0
.../groovy/groovy/util/SpoofTaskContainer.java | 0
.../groovy/org/codehaus/groovy/ant/GroovyTest.java | 0
.../codehaus/groovy/ant/GroovyTest2Class.groovy | 0
.../org/codehaus/groovy/ant/GroovycTest.java | 0
.../groovy-bsf/build.gradle | 0
.../codehaus/groovy/bsf/CachingGroovyEngine.java | 0
.../java/org/codehaus/groovy/bsf/GroovyEngine.java | 0
.../main/java/org/codehaus/groovy/bsf/package.html | 0
.../groovy-bsf/src/spec/doc/integrating-bsf.adoc | 0
.../groovy-bsf/src/spec/test/BSFSpecTest.java | 0
.../test/java/org/codehaus/groovy/bsf/BSFTest.java | 0
.../java/org/codehaus/groovy/bsf/CacheBSFTest.java | 0
.../resources/groovy/script/MapFromList.groovy | 0
.../groovy-console/build.gradle | 0
.../src/main/groovy/groovy/inspect/TextNode.groovy | 0
.../groovy/groovy/inspect/TextTreeNodeMaker.groovy | 0
.../groovy/inspect/swingui/AstBrowser.groovy | 0
.../inspect/swingui/AstNodeToScriptAdapter.groovy | 0
.../groovy/inspect/swingui/ObjectBrowser.groovy | 0
.../inspect/swingui/ScriptToTreeNodeAdapter.groovy | 0
.../groovy/groovy/inspect/swingui/package.html | 0
.../src/main/groovy/groovy/ui/Console.groovy | 0
.../main/groovy/groovy/ui/ConsoleActions.groovy | 0
.../src/main/groovy/groovy/ui/ConsoleApplet.groovy | 0
.../main/groovy/groovy/ui/ConsoleIvyPlugin.groovy | 0
.../src/main/groovy/groovy/ui/ConsoleSupport.java | 0
.../main/groovy/groovy/ui/ConsoleTextEditor.java | 0
.../src/main/groovy/groovy/ui/ConsoleView.groovy | 0
.../src/main/groovy/groovy/ui/HistoryRecord.groovy | 0
.../main/groovy/groovy/ui/OutputTransforms.groovy | 0
.../groovy/groovy/ui/SystemOutputInterceptor.java | 0
.../src/main/groovy/groovy/ui/package.html | 0
.../groovy/groovy/ui/text/AutoIndentAction.groovy | 0
.../groovy/groovy/ui/text/FindReplaceUtility.java | 0
.../main/groovy/groovy/ui/text/GroovyFilter.java | 0
.../ui/text/StructuredSyntaxDocumentFilter.java | 0
.../groovy/ui/text/StructuredSyntaxHandler.java | 0
.../groovy/ui/text/StructuredSyntaxResources.java | 0
.../src/main/groovy/groovy/ui/text/TextEditor.java | 0
.../groovy/groovy/ui/text/TextUndoManager.java | 0
.../src/main/groovy/groovy/ui/text/package.html | 0
.../groovy/groovy/ui/view/BasicContentPane.groovy | 0
.../main/groovy/groovy/ui/view/BasicMenuBar.groovy | 0
.../groovy/groovy/ui/view/BasicStatusBar.groovy | 0
.../main/groovy/groovy/ui/view/BasicToolBar.groovy | 0
.../src/main/groovy/groovy/ui/view/Defaults.groovy | 0
.../main/groovy/groovy/ui/view/GTKDefaults.groovy | 0
.../groovy/groovy/ui/view/MacOSXDefaults.groovy | 0
.../groovy/groovy/ui/view/MacOSXMenuBar.groovy | 0
.../groovy/groovy/ui/view/WindowsDefaults.groovy | 0
.../inspect/swingui/AstBrowserProperties.groovy | 0
.../src/main/resources/groovy/ui/ConsoleIcon.png | Bin
.../groovy/ui/InteractiveShell.properties | 0
.../main/resources/groovy/ui/icons/arrow_redo.png | Bin
.../main/resources/groovy/ui/icons/arrow_undo.png | Bin
.../main/resources/groovy/ui/icons/book_next.png | Bin
.../resources/groovy/ui/icons/book_previous.png | Bin
.../resources/groovy/ui/icons/bullet_green.png | Bin
.../src/main/resources/groovy/ui/icons/credits.txt | 0
.../src/main/resources/groovy/ui/icons/cross.png | Bin
.../src/main/resources/groovy/ui/icons/cut.png | Bin
.../src/main/resources/groovy/ui/icons/cut_red.png | Bin
.../src/main/resources/groovy/ui/icons/disk.png | Bin
.../src/main/resources/groovy/ui/icons/find.png | Bin
.../main/resources/groovy/ui/icons/folder_page.png | Bin
.../src/main/resources/groovy/ui/icons/page.png | Bin
.../main/resources/groovy/ui/icons/page_copy.png | Bin
.../main/resources/groovy/ui/icons/page_paste.png | Bin
.../main/resources/groovy/ui/icons/script_go.png | Bin
.../resources/groovy/ui/icons/text_replace.png | Bin
.../src/spec/doc/assets/img/GroovyConsole.gif | Bin
.../src/spec/doc/assets/img/astbrowser.png | Bin
.../spec/doc/assets/img/gconsole-sc-with-visu.png | Bin
.../doc/assets/img/gconsole-sc-without-visu.png | Bin
.../src/spec/doc/groovy-console.adoc | 0
.../swingui/AstNodeToScriptAdapterTest.groovy | 0
.../swingui/ScriptToTreeNodeAdapterTest.groovy | 0
.../groovy/swing/SwingBuilderConsoleTest.groovy | 0
.../ui/HistoryRecordGetTextToRunTests.groovy | 0
.../groovy/groovy/ui/text/GroovyFilterTests.groovy | 0
.../groovy-docgenerator/build.gradle | 0
.../org/codehaus/groovy/tools/DocGenerator.groovy | 0
.../codehaus/groovy/tools/DocGenerator.properties | 0
.../resources/org/codehaus/groovy/tools/groovy.ico | Bin
.../resources/org/codehaus/groovy/tools/index.html | 0
.../codehaus/groovy/tools/overview-summary.html | 0
.../org/codehaus/groovy/tools/stylesheet.css | 0
.../groovy/tools/template.allclasses-frame.html | 0
.../org/codehaus/groovy/tools/template.class.html | 0
.../codehaus/groovy/tools/template.index-all.html | 0
.../groovy/tools/template.overview-frame.html | 0
.../groovy/tools/template.package-frame.html | 0
.../groovy/tools/template.package-summary.html | 0
.../groovy-groovydoc/build.gradle | 0
.../codehaus/groovy/tools/groovydoc/Main.groovy | 0
.../groovy/groovydoc/GroovyAnnotationRef.java | 0
.../codehaus/groovy/groovydoc/GroovyClassDoc.java | 0
.../groovy/groovydoc/GroovyConstructorDoc.java | 0
.../org/codehaus/groovy/groovydoc/GroovyDoc.java | 0
.../groovy/groovydoc/GroovyDocErrorReporter.java | 0
.../groovydoc/GroovyExecutableMemberDoc.java | 0
.../codehaus/groovy/groovydoc/GroovyFieldDoc.java | 0
.../codehaus/groovy/groovydoc/GroovyMemberDoc.java | 0
.../codehaus/groovy/groovydoc/GroovyMethodDoc.java | 0
.../groovy/groovydoc/GroovyPackageDoc.java | 0
.../codehaus/groovy/groovydoc/GroovyParameter.java | 0
.../groovy/groovydoc/GroovyProgramElementDoc.java | 0
.../codehaus/groovy/groovydoc/GroovyRootDoc.java | 0
.../org/codehaus/groovy/groovydoc/GroovyTag.java | 0
.../org/codehaus/groovy/groovydoc/GroovyType.java | 0
.../org/codehaus/groovy/groovydoc/package.html | 0
.../tools/groovydoc/ArrayClassDocWrapper.java | 0
.../tools/groovydoc/ClasspathResourceManager.java | 0
.../tools/groovydoc/ExternalGroovyClassDoc.java | 0
.../groovy/tools/groovydoc/FileOutputTool.java | 0
.../tools/groovydoc/FileSystemResourceManager.java | 0
.../tools/groovydoc/GroovyDocTemplateEngine.java | 0
.../groovy/tools/groovydoc/GroovyDocTool.java | 0
.../groovy/tools/groovydoc/GroovyDocWriter.java | 0
.../tools/groovydoc/GroovyRootDocBuilder.java | 0
.../groovy/tools/groovydoc/LinkArgument.java | 0
.../groovy/tools/groovydoc/MockOutputTool.java | 0
.../groovy/tools/groovydoc/OutputTool.java | 0
.../groovy/tools/groovydoc/ResourceManager.java | 0
.../SimpleGroovyAbstractableElementDoc.java | 0
.../tools/groovydoc/SimpleGroovyAnnotationRef.java | 0
.../tools/groovydoc/SimpleGroovyClassDoc.java | 0
.../groovydoc/SimpleGroovyClassDocAssembler.java | 0
.../groovydoc/SimpleGroovyConstructorDoc.java | 0
.../groovy/tools/groovydoc/SimpleGroovyDoc.java | 0
.../groovydoc/SimpleGroovyExecutableMemberDoc.java | 0
.../tools/groovydoc/SimpleGroovyFieldDoc.java | 0
.../tools/groovydoc/SimpleGroovyMemberDoc.java | 0
.../tools/groovydoc/SimpleGroovyMethodDoc.java | 0
.../tools/groovydoc/SimpleGroovyPackageDoc.java | 0
.../tools/groovydoc/SimpleGroovyParameter.java | 0
.../groovydoc/SimpleGroovyProgramElementDoc.java | 0
.../tools/groovydoc/SimpleGroovyRootDoc.java | 0
.../groovy/tools/groovydoc/SimpleGroovyTag.java | 0
.../groovy/tools/groovydoc/SimpleGroovyType.java | 0
.../gstringTemplates/GroovyDocTemplateInfo.java | 0
.../codehaus/groovy/tools/groovydoc/package.html | 0
.../groovy/tools/groovydoc/Main.properties | 0
.../gstringTemplates/classLevel/classDocName.html | 0
.../classLevel/classDocStructuredData.xml | 0
.../packageLevel/package-frame.html | 0
.../packageLevel/package-summary.html | 0
.../packageLevel/packageDocStructuredData.xml | 0
.../topLevel/allclasses-frame.html | 0
.../gstringTemplates/topLevel/deprecated-list.html | 0
.../gstringTemplates/topLevel/help-doc.html | 0
.../gstringTemplates/topLevel/index-all.html | 0
.../groovydoc/gstringTemplates/topLevel/index.html | 0
.../gstringTemplates/topLevel/inherit.gif | Bin
.../gstringTemplates/topLevel/overview-frame.html | 0
.../topLevel/overview-summary.html | 0
.../topLevel/rootDocStructuredData.xml | 0
.../gstringTemplates/topLevel/stylesheet.css | 0
.../groovy-groovydoc/src/spec/doc/groovydoc.adoc | 0
.../groovy/tools/groovydoc/CustomGroovyDoc.java | 0
.../groovy/tools/groovydoc/GroovyDocTest.java | 0
.../groovy/tools/groovydoc/GroovyDocToolTest.java | 0
.../groovydoc/GroovyDocToolTestSampleGroovy.groovy | 0
.../tools/groovydoc/GroovyRootDocBuilderTest.java | 0
.../groovydoc/SimpleGroovyClassDocTests.groovy | 0
.../groovydoc/SimpleGroovyRootDocTests.groovy | 0
.../groovy/tools/groovydoc/testfiles/Alias.groovy | 0
.../groovydoc/testfiles/ArrayPropertyLink.groovy | 0
.../groovy/tools/groovydoc/testfiles/Builder.java | 0
.../testfiles/ClassWithAnonymousInnerClass.java | 0
.../testfiles/ClassWithMethodComment.java | 0
.../groovydoc/testfiles/DeprecatedClass.groovy | 0
.../groovydoc/testfiles/DeprecatedField.groovy | 0
.../groovydoc/testfiles/DocumentedClass.groovy | 0
.../testfiles/EnumWithDeprecatedConstants.groovy | 0
.../groovydoc/testfiles/ExampleVisibilityG.groovy | 0
.../groovydoc/testfiles/ExampleVisibilityJ.java | 0
.../GroovyClassWithMultipleInterfaces.groovy | 0
.../groovydoc/testfiles/GroovyInterface1.groovy | 0
.../GroovyInterfaceWithMultipleInterfaces.groovy | 0
.../groovydoc/testfiles/InnerClassProperty.groovy | 0
.../tools/groovydoc/testfiles/InnerEnum.groovy | 0
.../testfiles/JavaClassWithMultipleInterfaces.java | 0
.../tools/groovydoc/testfiles/JavaInterface1.java | 0
.../JavaInterfaceWithMultipleInterfaces.java | 0
.../testfiles/MultipleConstructorErrorBug.java | 0
.../tools/groovydoc/testfiles/PropertyLink.groovy | 0
.../tools/groovydoc/testfiles/StaticModifier.java | 0
.../groovydoc/testfiles/TestConstructors.groovy | 0
.../groovy/tools/groovydoc/testfiles/a/Base.groovy | 0
.../tools/groovydoc/testfiles/a/DescendantA.groovy | 0
.../tools/groovydoc/testfiles/a/DescendantC.groovy | 0
.../tools/groovydoc/testfiles/a/DescendantD.groovy | 0
.../groovy/tools/groovydoc/testfiles/b/Base.groovy | 0
.../tools/groovydoc/testfiles/b/DescendantB.groovy | 0
.../tools/groovydoc/testfiles/c/DescendantE.groovy | 0
.../tools/groovydoc/testfiles/c/DescendantF.groovy | 0
.../staticInit/GroovyWithFailingStaticInit.groovy | 0
.../staticInit/JavaWithFailingStaticInit.java | 0
.../UsesClassesWithFailingStaticInit.groovy | 0
.../test/resources/groovydoc/groovyDocTests.xml | 0
.../tools/groovydoc/testfiles/classDocName.html | 0
.../groovy-groovysh/build.gradle | 0
.../groovy/tools/shell/AnsiDetector.groovy | 0
.../groovy/tools/shell/BufferManager.groovy | 0
.../org/codehaus/groovy/tools/shell/Command.groovy | 0
.../groovy/tools/shell/CommandAlias.groovy | 0
.../groovy/tools/shell/CommandException.groovy | 0
.../groovy/tools/shell/CommandRegistry.groovy | 0
.../groovy/tools/shell/CommandSupport.groovy | 0
.../tools/shell/ComplexCommandSupport.groovy | 0
.../groovy/tools/shell/ExitNotification.groovy | 0
.../codehaus/groovy/tools/shell/Groovysh.groovy | 0
.../tools/shell/InteractiveShellRunner.groovy | 0
.../codehaus/groovy/tools/shell/Interpreter.groovy | 0
.../org/codehaus/groovy/tools/shell/Main.groovy | 0
.../org/codehaus/groovy/tools/shell/Parser.groovy | 0
.../PatchedCandidateListCompletionHandler.groovy | 0
.../groovy/tools/shell/PatchedConsoleReader.groovy | 0
.../org/codehaus/groovy/tools/shell/Shell.groovy | 0
.../codehaus/groovy/tools/shell/ShellRunner.groovy | 0
.../tools/shell/commands/AliasCommand.groovy | 0
.../tools/shell/commands/ClearCommand.groovy | 0
.../tools/shell/commands/DisplayCommand.groovy | 0
.../groovy/tools/shell/commands/DocCommand.groovy | 0
.../groovy/tools/shell/commands/EditCommand.groovy | 0
.../groovy/tools/shell/commands/ExitCommand.groovy | 0
.../groovy/tools/shell/commands/HelpCommand.groovy | 0
.../tools/shell/commands/HistoryCommand.groovy | 0
.../tools/shell/commands/ImportCommand.groovy | 0
.../tools/shell/commands/InspectCommand.groovy | 0
.../groovy/tools/shell/commands/LoadCommand.groovy | 0
.../tools/shell/commands/PurgeCommand.groovy | 0
.../tools/shell/commands/RecordCommand.groovy | 0
.../tools/shell/commands/RegisterCommand.groovy | 0
.../groovy/tools/shell/commands/SaveCommand.groovy | 0
.../groovy/tools/shell/commands/SetCommand.groovy | 0
.../tools/shell/commands/ShadowCommand.groovy | 0
.../groovy/tools/shell/commands/ShowCommand.groovy | 0
.../shell/completion/CommandNameCompleter.groovy | 0
.../completion/CustomClassSyntaxCompletor.groovy | 0
.../shell/completion/FileNameCompleter.groovy | 0
.../shell/completion/GroovySyntaxCompletor.groovy | 0
.../shell/completion/IdentifierCompletor.groovy | 0
.../shell/completion/ImportsSyntaxCompletor.groovy | 0
.../completion/InfixKeywordSyntaxCompletor.groovy | 0
.../shell/completion/KeywordSyntaxCompletor.groovy | 0
.../completion/NavigablePropertiesCompleter.groovy | 0
.../ReflectionCompletionCandidate.groovy | 0
.../shell/completion/ReflectionCompletor.groovy | 0
.../completion/StricterArgumentCompleter.groovy | 0
.../completion/VariableSyntaxCompletor.groovy | 0
.../org/codehaus/groovy/tools/shell/package.html | 0
.../tools/shell/util/CommandArgumentParser.groovy | 0
.../shell/util/CurlyCountingGroovyLexer.groovy | 0
.../shell/util/DefaultCommandsRegistrar.groovy | 0
.../groovy/tools/shell/util/HelpFormatter.groovy | 0
.../groovy/tools/shell/util/JAnsiHelper.groovy | 0
.../tools/shell/util/NoExitSecurityManager.groovy | 0
.../groovy/tools/shell/util/PackageHelper.groovy | 0
.../tools/shell/util/PackageHelperImpl.groovy | 0
.../tools/shell/util/ScriptVariableAnalyzer.groovy | 0
.../groovy/tools/shell/util/SimpleCompletor.groovy | 0
.../tools/shell/util/WrappedInputStream.groovy | 0
.../tools/shell/util/XmlCommandRegistrar.groovy | 0
.../codehaus/groovy/tools/shell/util/package.html | 0
.../groovy/tools/shell/CommandAlias.properties | 0
.../groovy/tools/shell/CommandSupport.properties | 0
.../groovy/tools/shell/Groovysh.properties | 0
.../codehaus/groovy/tools/shell/Main.properties | 0
.../tools/shell/commands/AliasCommand.properties | 0
.../tools/shell/commands/ClearCommand.properties | 0
.../tools/shell/commands/DisplayCommand.properties | 0
.../tools/shell/commands/DocCommand.properties | 0
.../tools/shell/commands/EditCommand.properties | 0
.../tools/shell/commands/ExitCommand.properties | 0
.../tools/shell/commands/HelpCommand.properties | 0
.../tools/shell/commands/HistoryCommand.properties | 0
.../tools/shell/commands/ImportCommand.properties | 0
.../tools/shell/commands/InspectCommand.properties | 0
.../tools/shell/commands/LoadCommand.properties | 0
.../tools/shell/commands/PurgeCommand.properties | 0
.../tools/shell/commands/RecordCommand.properties | 0
.../shell/commands/RegisterCommand.properties | 0
.../tools/shell/commands/SaveCommand.properties | 0
.../tools/shell/commands/SetCommand.properties | 0
.../tools/shell/commands/ShadowCommand.properties | 0
.../tools/shell/commands/ShowCommand.properties | 0
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 0
.../groovy/tools/shell/AllCompletorsTest.groovy | 0
.../groovy/tools/shell/AnsiDetectorTest.groovy | 0
.../groovy/tools/shell/CommandCompletorTest.groovy | 0
.../groovy/tools/shell/CompletorTestSupport.groovy | 0
.../groovy/tools/shell/ErrorDisplayTest.groovy | 0
.../groovy/tools/shell/GroovyshParsersTest.groovy | 0
.../groovy/tools/shell/GroovyshTest.groovy | 0
.../groovy/tools/shell/ImportCompletorTest.groovy | 0
.../groovy/tools/shell/ShellRunnerTest.groovy | 0
.../tools/shell/ShellRunnerTestSupport.groovy | 0
.../codehaus/groovy/tools/shell/ShellTest.groovy | 0
.../tools/shell/commands/AliasCommandTest.groovy | 0
.../tools/shell/commands/ClearCommandTest.groovy | 0
.../tools/shell/commands/CommandTestSupport.groovy | 0
.../commands/ComplexCommandSupportTest.groovy | 0
.../tools/shell/commands/DisplayCommandTest.groovy | 0
.../tools/shell/commands/DocCommandTest.groovy | 0
.../tools/shell/commands/EchoCommand.properties | 0
.../tools/shell/commands/EditCommandTest.groovy | 0
.../tools/shell/commands/ExitCommandTest.groovy | 0
.../tools/shell/commands/HelpCommandTest.groovy | 0
.../tools/shell/commands/HistoryCommandTest.groovy | 0
.../tools/shell/commands/ImportCommandTest.groovy | 0
.../tools/shell/commands/InspectCommandTest.groovy | 0
.../tools/shell/commands/LoadCommandTest.groovy | 0
.../tools/shell/commands/PurgeCommandTest.groovy | 0
.../tools/shell/commands/RecordCommandTest.groovy | 0
.../shell/commands/RegisterCommandTest.groovy | 0
.../tools/shell/commands/SaveCommandTest.groovy | 0
.../tools/shell/commands/SetCommandTest.groovy | 0
.../tools/shell/commands/ShowCommandTest.groovy | 0
.../completion/CustomClassCompletorTest.groovy | 0
.../shell/completion/FileNameCompleterTest.groovy | 0
.../completion/GroovySyntaxCompletorTest.groovy | 0
.../completion/ImportsSyntaxCompletorTest.groovy | 0
.../shell/completion/KeywordCompletorTest.groovy | 0
.../NavigablePropertiesCompleterTest.groovy | 0
.../completion/ReflectionCompletorTest.groovy | 0
.../tools/shell/completion/TokenUtilTest.groovy | 0
.../shell/completion/VariableCompletorTest.groovy | 0
.../shell/expr/ClassWithPrivateConstructor.groovy | 0
.../groovy/tools/shell/expr/ExprTestSupport.groovy | 0
.../groovy/tools/shell/expr/TimeItTest.groovy | 0
.../shell/util/CommandArgumentParserTest.groovy | 0
.../shell/util/CurlyCountingGroovyLexerTest.groovy | 0
.../tools/shell/util/MessageSourceTest.groovy | 0
.../tools/shell/util/PackageHelperImplTest.groovy | 0
.../shell/util/ScriptVariableAnalyzerTest.groovy | 0
.../tools/shell/util/WrappedInputStreamTest.groovy | 0
.../tools/shell/util/MessageSourceTest.properties | 0
.../groovy-jmx/build.gradle | 0
.../jmx/builder/JmxAttributeInfoManager.groovy | 0
.../groovy/jmx/builder/JmxBeanExportFactory.groovy | 0
.../groovy/jmx/builder/JmxBeanFactory.groovy | 0
.../groovy/jmx/builder/JmxBeanInfoManager.groovy | 0
.../groovy/jmx/builder/JmxBeansFactory.groovy | 0
.../groovy/groovy/jmx/builder/JmxBuilder.groovy | 0
.../groovy/jmx/builder/JmxBuilderTools.groovy | 0
.../jmx/builder/JmxClientConnectorFactory.groovy | 0
.../groovy/jmx/builder/JmxEmitterFactory.groovy | 0
.../groovy/jmx/builder/JmxListenerFactory.groovy | 0
.../groovy/jmx/builder/JmxMetaMapBuilder.groovy | 0
.../jmx/builder/JmxOperationInfoManager.groovy | 0
.../jmx/builder/JmxServerConnectorFactory.groovy | 0
.../groovy/jmx/builder/JmxTimerFactory.groovy | 0
.../groovy/groovy/jmx/builder/package-info.groovy | 0
.../groovy/jmx/builder/JmxBuilderException.java | 0
.../groovy/jmx/builder/JmxBuilderModelMBean.java | 0
.../java/groovy/jmx/builder/JmxEventEmitter.java | 0
.../groovy/jmx/builder/JmxEventEmitterMBean.java | 0
.../java/groovy/jmx/builder/JmxEventListener.java | 0
.../src/main/java/groovy/util/GroovyMBean.java | 0
.../groovy-jmx/src/spec/doc/jmx.adoc | 0
.../groovy-jmx/src/spec/test/JmxTest.groovy | 0
.../jmx/builder/JmxAttributeInfoManagerTest.groovy | 0
.../jmx/builder/JmxBeanExportFactoryTest.groovy | 0
.../groovy/jmx/builder/JmxBeanFactoryTest.groovy | 0
.../jmx/builder/JmxBeanInfoManagerTest.groovy | 0
.../groovy/jmx/builder/JmxBeansFactoryTest.groovy | 0
.../groovy/jmx/builder/JmxBuilderToolsTest.groovy | 0
.../builder/JmxClientConnectorFactoryTest.groovy | 0
.../builder/JmxEmbeddedMetaMapBuilderTest.groovy | 0
.../jmx/builder/JmxEmitterFactoryTest.groovy | 0
.../jmx/builder/JmxListenerFactoryTest.groovy | 0
.../jmx/builder/JmxMetaMapBuilderTest.groovy | 0
.../jmx/builder/JmxOperationInfoManagerTest.groovy | 0
.../builder/JmxServerConnectorFactoryTest.groovy | 0
.../groovy/jmx/builder/JmxTimerFactoryTest.groovy | 0
.../groovy/jmx/builder/MockEmbeddedClass.groovy | 0
.../jmx/builder/MockManagedGroovyObject.groovy | 0
.../src/test/groovy/groovy/util/Dummy.java | 0
.../groovy/jmx/builder/JmxConnectorHelper.java | 0
.../java/groovy/jmx/builder/MockJmxListener.java | 0
.../java/groovy/jmx/builder/MockManagedObject.java | 0
.../java/groovy/jmx/builder/MockSimpleObject.java | 0
.../groovy/jmx/builder/MockSimpleObjectMBean.java | 0
.../src/test/java/groovy/util/DummyMBean.java | 0
.../src/test/java/groovy/util/MBeanTest.java | 0
.../groovy-json/build.gradle | 0
.../src/main/java/groovy/json/JsonBuilder.java | 0
.../src/main/java/groovy/json/JsonDelegate.java | 0
.../src/main/java/groovy/json/JsonException.java | 0
.../src/main/java/groovy/json/JsonLexer.java | 0
.../src/main/java/groovy/json/JsonOutput.java | 0
.../src/main/java/groovy/json/JsonParser.java | 0
.../src/main/java/groovy/json/JsonParserType.java | 0
.../src/main/java/groovy/json/JsonSlurper.java | 0
.../main/java/groovy/json/JsonSlurperClassic.java | 0
.../src/main/java/groovy/json/JsonToken.java | 0
.../src/main/java/groovy/json/JsonTokenType.java | 0
.../java/groovy/json/StreamingJsonBuilder.java | 0
.../main/java/groovy/json/StringEscapeUtils.java | 0
.../main/java/groovy/json/internal/ArrayUtils.java | 0
.../java/groovy/json/internal/BaseJsonParser.java | 0
.../src/main/java/groovy/json/internal/Byt.java | 0
.../java/groovy/json/internal/ByteScanner.java | 0
.../src/main/java/groovy/json/internal/Cache.java | 0
.../main/java/groovy/json/internal/CacheType.java | 0
.../main/java/groovy/json/internal/CharBuf.java | 0
.../java/groovy/json/internal/CharScanner.java | 0
.../groovy/json/internal/CharSequenceValue.java | 0
.../java/groovy/json/internal/CharacterSource.java | 0
.../main/java/groovy/json/internal/Charsets.java | 0
.../src/main/java/groovy/json/internal/Chr.java | 0
.../src/main/java/groovy/json/internal/Dates.java | 0
.../main/java/groovy/json/internal/Exceptions.java | 0
.../java/groovy/json/internal/FastStringUtils.java | 0
.../src/main/java/groovy/json/internal/IO.java | 0
.../java/groovy/json/internal/JsonFastParser.java | 0
.../groovy/json/internal/JsonParserCharArray.java | 0
.../java/groovy/json/internal/JsonParserLax.java | 0
.../internal/JsonParserUsingCharacterSource.java | 0
.../groovy/json/internal/JsonStringDecoder.java | 0
.../main/java/groovy/json/internal/LazyMap.java | 0
.../java/groovy/json/internal/LazyValueMap.java | 0
.../java/groovy/json/internal/MapItemValue.java | 0
.../java/groovy/json/internal/NumberValue.java | 0
.../json/internal/ReaderCharacterSource.java | 0
.../java/groovy/json/internal/SimpleCache.java | 0
.../src/main/java/groovy/json/internal/Sys.java | 0
.../src/main/java/groovy/json/internal/Type.java | 0
.../src/main/java/groovy/json/internal/Value.java | 0
.../java/groovy/json/internal/ValueContainer.java | 0
.../main/java/groovy/json/internal/ValueList.java | 0
.../main/java/groovy/json/internal/ValueMap.java | 0
.../java/groovy/json/internal/ValueMapImpl.java | 0
.../groovy-json/src/spec/doc/json-builder.adoc | 0
.../groovy-json/src/spec/doc/json-userguide.adoc | 0
.../src/spec/doc/streaming-jason-builder.adoc | 0
.../src/spec/test/JsonBuilderTest2.groovy | 0
.../src/spec/test/StreamingJsonBuilderTest2.groovy | 0
.../src/spec/test/json/JsonBuilderTest.groovy | 0
.../groovy-json/src/spec/test/json/JsonTest.groovy | 0
.../spec/test/json/StreamingJsonBuilderTest.groovy | 0
.../src/test/groovy/groovy/json/CharBufTest.groovy | 0
.../src/test/groovy/groovy/json/IOTest.groovy | 0
.../test/groovy/groovy/json/JsonBuilderTest.groovy | 0
.../test/groovy/groovy/json/JsonLexerTest.groovy | 0
.../test/groovy/groovy/json/JsonOutputTest.groovy | 0
.../groovy/json/JsonSlurperCharSourceTest.groovy | 0
.../groovy/json/JsonSlurperIndexOverlayTest.groovy | 0
.../groovy/groovy/json/JsonSlurperLaxTest.groovy | 0
.../test/groovy/groovy/json/JsonSlurperTest.groovy | 0
.../groovy/groovy/json/JsonTokenTypeTest.groovy | 0
.../groovy/groovy/json/JsonTokenValueTest.groovy | 0
.../groovy/groovy/json/RealJsonPayloadsTest.groovy | 0
.../groovy/json/StreamingJsonBuilderTest.groovy | 0
.../groovy/json/internal/ArrayUtilsTest.groovy | 0
.../groovy/json/internal/CharScannerTest.groovy | 0
.../groovy/groovy/json/internal/ChrTest.groovy | 0
.../json/internal/FastStringUtilsTest.groovy | 0
.../FastStringUtilsUnsafeDisabledTest.groovy | 0
.../groovy/groovy/json/internal/LazyMapTest.groovy | 0
.../json/internal/ReaderCharacterSourceTest.groovy | 0
.../groovy-jsr223/build.gradle | 0
.../groovy/jsr223/GroovyCompiledScript.java | 0
.../groovy/jsr223/GroovyScriptEngineFactory.java | 0
.../groovy/jsr223/GroovyScriptEngineImpl.java | 0
.../codehaus/groovy/jsr223/ScriptExtensions.java | 0
.../groovy/jsr223/ScriptStaticExtensions.java | 0
.../services/javax.script.ScriptEngineFactory | 0
.../src/spec/doc/integrating-jsr223.adoc | 0
.../src/spec/test/JSR223SpecTest.java | 0
.../org/codehaus/groovy/jsr223/JSR223Test.groovy | 0
.../org/codehaus/groovy/jsr223/SugarTest.groovy | 0
.../groovy/jsr223/vm6/JavascriptTest.groovy | 0
.../codehaus/groovy/jsr223/JSR223SecurityTest.java | 0
.../groovy-nio/build.gradle | 0
.../codehaus/groovy/runtime/NioGroovyMethods.java | 0
.../org/codehaus/groovy/runtime/WritablePath.java | 0
.../groovy/runtime/NioGroovyMethodsTest.groovy | 0
.../groovy-servlet/build.gradle | 0
.../java/groovy/servlet/AbstractHttpServlet.java | 0
.../main/java/groovy/servlet/GroovyServlet.java | 0
.../main/java/groovy/servlet/ServletBinding.java | 0
.../main/java/groovy/servlet/ServletCategory.java | 0
.../main/java/groovy/servlet/TemplateServlet.java | 0
.../src/main/java/groovy/servlet/package.html | 0
.../src/spec/doc/servlet-userguide.adoc | 0
.../src/spec/test/servlet/GroovyServletTest.groovy | 0
.../groovy/servlet/AbstractHttpServletTest.groovy | 0
.../groovy/servlet/ServletBindingTest.groovy | 0
.../java/groovy/servlet/GroovyServletTest.java | 0
.../groovy-sql/build.gradle | 0
.../sql/BatchingPreparedStatementWrapper.java | 0
.../java/groovy/sql/BatchingStatementWrapper.java | 0
.../src/main/java/groovy/sql/CallResultSet.java | 0
.../src/main/java/groovy/sql/DataSet.java | 0
.../src/main/java/groovy/sql/ExpandedVariable.java | 0
.../main/java/groovy/sql/ExtractIndexAndSql.java | 0
.../src/main/java/groovy/sql/GroovyResultSet.java | 0
.../java/groovy/sql/GroovyResultSetExtension.java | 0
.../main/java/groovy/sql/GroovyResultSetProxy.java | 0
.../src/main/java/groovy/sql/GroovyRowResult.java | 0
.../src/main/java/groovy/sql/InOutParameter.java | 0
.../src/main/java/groovy/sql/InParameter.java | 0
.../src/main/java/groovy/sql/OutParameter.java | 0
.../java/groovy/sql/ResultSetMetaDataWrapper.java | 0
.../java/groovy/sql/ResultSetOutParameter.java | 0
.../groovy-sql/src/main/java/groovy/sql/Sql.java | 0
.../main/java/groovy/sql/SqlOrderByVisitor.java | 0
.../src/main/java/groovy/sql/SqlWhereVisitor.java | 0
.../src/main/java/groovy/sql/SqlWithParams.java | 0
.../src/main/java/groovy/sql/package.html | 0
.../codehaus/groovy/runtime/SqlGroovyMethods.java | 0
.../test/groovy/groovy/bugs/ForAndSqlBug.groovy | 0
.../test/groovy/groovy/bugs/Groovy5041Bug.groovy | 0
.../groovy/sql/ExtractIndexAndSqlTest.groovy | 0
.../groovy/groovy/sql/GroovyRowResultTest.groovy | 0
.../src/test/groovy/groovy/sql/Person.groovy | 0
.../src/test/groovy/groovy/sql/PersonTest.groovy | 0
.../src/test/groovy/groovy/sql/SqlBatchTest.groovy | 0
.../src/test/groovy/groovy/sql/SqlCacheTest.groovy | 0
.../src/test/groovy/groovy/sql/SqlCallTest.groovy | 0
.../test/groovy/groovy/sql/SqlCompleteTest.groovy | 0
.../sql/SqlCompleteWithoutDataSourceTest.groovy | 0
.../groovy/groovy/sql/SqlHelperTestCase.groovy | 0
.../src/test/groovy/groovy/sql/SqlRowsTest.groovy | 0
.../test/groovy/groovy/sql/SqlStatementTest.groovy | 0
.../src/test/groovy/groovy/sql/SqlTest.groovy | 0
.../test/groovy/groovy/sql/SqlTestConstants.groovy | 0
.../groovy/sql/SqlTransactionConnectionTest.groovy | 0
.../groovy/sql/SqlTransactionDataSourceTest.groovy | 0
.../groovy/sql/SqlTransactionTestCase.groovy | 0
.../groovy/groovy/sql/SqlWithBuilderTest.groovy | 0
.../groovy/sql/SqlWithTypedResultsTest.groovy | 0
.../groovy-swing/build.gradle | 0
.../groovy/groovy/swing/LookAndFeelHelper.groovy | 0
.../main/groovy/groovy/swing/SwingBuilder.groovy | 0
.../swing/binding/AbstractButtonProperties.java | 0
.../swing/binding/AbstractSyntheticBinding.java | 0
.../binding/AbstractSyntheticMetaMethods.groovy | 0
.../swing/binding/JComboBoxMetaMethods.groovy | 0
.../groovy/swing/binding/JComboBoxProperties.java | 0
.../groovy/swing/binding/JComponentProperties.java | 0
.../groovy/swing/binding/JListMetaMethods.groovy | 0
.../groovy/swing/binding/JListProperties.groovy | 0
.../groovy/swing/binding/JScrollBarProperties.java | 0
.../groovy/swing/binding/JSliderProperties.java | 0
.../groovy/swing/binding/JSpinnerProperties.java | 0
.../groovy/swing/binding/JTableMetaMethods.groovy | 0
.../groovy/swing/binding/JTableProperties.java | 0
.../swing/binding/JTextComponentProperties.java | 0
.../main/groovy/groovy/swing/binding/package.html | 0
.../groovy/swing/factory/ActionFactory.groovy | 0
.../groovy/groovy/swing/factory/BeanFactory.groovy | 0
.../groovy/swing/factory/BevelBorderFactory.groovy | 0
.../groovy/groovy/swing/factory/BindFactory.groovy | 0
.../groovy/swing/factory/BindGroupFactory.groovy | 0
.../groovy/swing/factory/BindProxyFactory.groovy | 0
.../groovy/groovy/swing/factory/BoxFactory.groovy | 0
.../groovy/swing/factory/BoxLayoutFactory.groovy | 0
.../groovy/swing/factory/ButtonGroupFactory.groovy | 0
.../groovy/swing/factory/CellEditorFactory.groovy | 0
.../groovy/swing/factory/CollectionFactory.groovy | 0
.../groovy/swing/factory/ColumnFactory.groovy | 0
.../groovy/swing/factory/ColumnModelFactory.groovy | 0
.../groovy/swing/factory/ComboBoxFactory.groovy | 0
.../groovy/swing/factory/ComponentFactory.groovy | 0
.../swing/factory/CompoundBorderFactory.groovy | 0
.../groovy/swing/factory/DialogFactory.groovy | 0
.../groovy/swing/factory/EmptyBorderFactory.groovy | 0
.../swing/factory/EtchedBorderFactory.groovy | 0
.../swing/factory/FormattedTextFactory.groovy | 0
.../groovy/swing/factory/FrameFactory.groovy | 0
.../groovy/swing/factory/GridBagFactory.groovy | 0
.../groovy/swing/factory/ImageIconFactory.groovy | 0
.../swing/factory/InternalFrameFactory.groovy | 0
.../groovy/swing/factory/LayoutFactory.groovy | 0
.../groovy/swing/factory/LineBorderFactory.groovy | 0
.../groovy/groovy/swing/factory/ListFactory.groovy | 0
.../groovy/groovy/swing/factory/MapFactory.groovy | 0
.../groovy/swing/factory/MatteBorderFactory.groovy | 0
.../groovy/swing/factory/RendererFactory.groovy | 0
.../swing/factory/RichActionWidgetFactory.groovy | 0
.../swing/factory/RootPaneContainerFactory.groovy | 0
.../groovy/swing/factory/ScrollPaneFactory.groovy | 0
.../groovy/swing/factory/SeparatorFactory.groovy | 0
.../groovy/swing/factory/SplitPaneFactory.groovy | 0
.../groovy/swing/factory/SwingBorderFactory.groovy | 0
.../groovy/swing/factory/TabbedPaneFactory.groovy | 0
.../groovy/swing/factory/TableFactory.groovy | 0
.../groovy/swing/factory/TableLayoutFactory.groovy | 0
.../groovy/swing/factory/TableModelFactory.groovy | 0
.../swing/factory/TextArgWidgetFactory.groovy | 0
.../swing/factory/TitledBorderFactory.groovy | 0
.../groovy/swing/factory/WidgetFactory.groovy | 0
.../groovy/swing/factory/WindowFactory.groovy | 0
.../main/groovy/groovy/swing/factory/package.html | 0
.../groovy/swing/impl/ClosureCellEditor.groovy | 0
.../groovy/groovy/swing/impl/ClosureRenderer.java | 0
.../groovy/groovy/swing/impl/DefaultAction.java | 0
.../groovy/swing/impl/ListWrapperListModel.java | 0
.../main/groovy/groovy/swing/impl/TableLayout.java | 0
.../groovy/groovy/swing/impl/TableLayoutCell.java | 0
.../groovy/groovy/swing/impl/TableLayoutRow.java | 0
.../src/main/groovy/groovy/swing/impl/package.html | 0
.../src/main/groovy/groovy/swing/package.html | 0
.../main/java/groovy/inspect/swingui/TableMap.java | 0
.../java/groovy/inspect/swingui/TableSorter.java | 0
.../src/main/java/groovy/model/ClosureModel.java | 0
.../main/java/groovy/model/DefaultTableColumn.java | 0
.../main/java/groovy/model/DefaultTableModel.java | 0
.../src/main/java/groovy/model/FormModel.java | 0
.../main/java/groovy/model/NestedValueModel.java | 0
.../src/main/java/groovy/model/PropertyModel.java | 0
.../src/main/java/groovy/model/ValueHolder.java | 0
.../src/main/java/groovy/model/ValueModel.java | 0
.../src/main/java/groovy/model/package.html | 0
.../groovy/binding/AbstractFullBinding.java | 0
.../codehaus/groovy/binding/AggregateBinding.java | 0
.../java/org/codehaus/groovy/binding/BindPath.java | 0
.../org/codehaus/groovy/binding/BindingProxy.java | 0
.../codehaus/groovy/binding/BindingUpdatable.java | 0
.../groovy/binding/ClosureSourceBinding.java | 0
.../groovy/binding/ClosureTriggerBinding.java | 0
.../groovy/binding/EventTriggerBinding.java | 0
.../org/codehaus/groovy/binding/FullBinding.java | 0
.../groovy/binding/MutualPropertyBinding.java | 0
.../codehaus/groovy/binding/PropertyBinding.java | 0
.../binding/PropertyChangeProxyTargetBinding.java | 0
.../groovy/binding/PropertyPathFullBinding.java | 0
.../org/codehaus/groovy/binding/SourceBinding.java | 0
.../groovy/binding/SwingTimerTriggerBinding.java | 0
.../org/codehaus/groovy/binding/TargetBinding.java | 0
.../codehaus/groovy/binding/TriggerBinding.java | 0
.../java/org/codehaus/groovy/binding/package.html | 0
.../groovy/runtime/SwingGroovyMethods.java | 0
.../src/spec/assets/img/SwingBuilder001.gif | Bin
.../groovy-swing/src/spec/doc/swing-builder.adoc | 0
.../src/spec/test/SwingBuilderTest.groovy | 0
.../groovy/groovy/ClosureSwingListenerTest.groovy | 0
.../src/test/groovy/groovy/StrangeBean.java | 0
.../test/groovy/groovy/StrangeBeanBeanInfo.java | 0
.../test/groovy/groovy/StrangeEventListener.java | 0
.../groovy/groovy/beans/BindableSwingTest.groovy | 0
.../groovy/groovy/beans/VetoableSwingTest.groovy | 0
.../test/groovy/groovy/bugs/Groovy303_Bug.groovy | 0
.../src/test/groovy/groovy/bugs/PropertyBug.groovy | 0
.../test/groovy/groovy/model/TableModelTest.groovy | 0
.../test/groovy/groovy/swing/BindPathTest.groovy | 0
.../groovy/swing/SwingBuilderBindingsTest.groovy | 0
.../groovy/swing/SwingBuilderTableTest.groovy | 0
.../groovy/groovy/swing/SwingBuilderTest.groovy | 0
.../groovy/swing/SwingMetaMethodsTest.groovy | 0
.../TitledBorderFactoryJustificationTest.groovy | 0
.../groovy/groovy/util/GroovySwingTestCase.groovy | 0
.../org/codehaus/groovy/runtime/DummyBean.java | 0
.../groovy-templates/build.gradle | 0
.../groovy/groovy/text/GStringTemplateEngine.java | 0
.../groovy/groovy/text/SimpleTemplateEngine.java | 0
.../groovy/text/StreamingTemplateEngine.java | 0
.../src/main/groovy/groovy/text/Template.java | 0
.../main/groovy/groovy/text/TemplateEngine.java | 0
.../groovy/text/TemplateExecutionException.java | 0
.../groovy/groovy/text/TemplateParseException.java | 0
.../main/groovy/groovy/text/XmlTemplateEngine.java | 0
.../groovy/text/markup/AutoNewLineTransformer.java | 0
.../groovy/groovy/text/markup/BaseTemplate.java | 0
.../groovy/text/markup/DelegatingIndentWriter.java | 0
.../groovy/groovy/text/markup/IncludeType.java | 0
.../text/markup/MarkupBuilderCodeTransformer.java | 0
.../groovy/text/markup/MarkupTemplateEngine.java | 0
.../MarkupTemplateTypeCheckingExtension.groovy | 0
.../groovy/groovy/text/markup/TagLibAdapter.groovy | 0
.../groovy/text/markup/TemplateASTTransformer.java | 0
.../groovy/text/markup/TemplateConfiguration.java | 0
.../groovy/text/markup/TemplateResolver.java | 0
.../main/groovy/groovy/text/markup/package.html | 0
.../src/main/groovy/groovy/text/package.html | 0
.../src/spec/doc/markup-template-engine.adoc | 0
.../src/spec/doc/template-engines.adoc | 0
.../src/spec/test-resources/layout-main.tpl | 0
.../src/spec/test-resources/locale_include.tpl | 0
.../spec/test-resources/locale_include_fr_FR.tpl | 0
.../src/spec/test-resources/main.tpl | 0
.../src/spec/test-resources/other_template.tpl | 0
.../src/spec/test-resources/raw.txt | 0
.../src/spec/test-resources/to_be_escaped.txt | 0
.../spec/test/MarkupTemplateEngineSpecTest.groovy | 0
.../src/spec/test/MyTemplate.groovy | 0
.../src/spec/test/TemplateEnginesTest.groovy | 0
.../groovy/SimpleGStringTemplateEngineTest.groovy | 0
.../groovy/groovy/SimpleTemplateEngineTest.groovy | 0
.../groovy/groovy/text/CustomBaseTemplate.java | 0
.../groovy/text/MarkupTemplateEngineTest.groovy | 0
.../groovy/groovy/text/SimpleTemplateTest.groovy | 0
.../StreamingTemplateEngineSpecification.groovy | 0
.../groovy/text/StreamingTemplateEngineTest.groovy | 0
.../groovy/text/markup/TemplateResourceTest.groovy | 0
.../src/test/java/groovy/text/TemplateTest.java | 0
.../java/groovy/text/XmlTemplateEngineTest.java | 0
.../src/test/resources/includes/body.tpl | 0
.../src/test/resources/includes/hello-escaped.txt | 0
.../src/test/resources/includes/hello.html | 0
.../src/test/resources/includes/hello.tpl | 0
.../src/test/resources/includes/hello_fr_FR.tpl | 0
.../test/resources/includes/typecheckedinclude.tpl | 0
.../groovy-test/build.gradle | 0
.../groovy/groovy/lang/GroovyLogTestCase.groovy | 0
.../groovy/groovy/mock/interceptor/Demand.groovy | 0
.../groovy/groovy/mock/interceptor/Ignore.groovy | 0
.../mock/interceptor/LooseExpectation.groovy | 0
.../groovy/groovy/mock/interceptor/MockFor.groovy | 0
.../groovy/mock/interceptor/MockInterceptor.groovy | 0
.../mock/interceptor/StrictExpectation.groovy | 0
.../groovy/groovy/mock/interceptor/StubFor.groovy | 0
.../groovy/groovy/mock/interceptor/package.html | 0
.../groovy/groovy/util/GroovyShellTestCase.groovy | 0
.../groovy/util/JavadocAssertionTestBuilder.groovy | 0
.../groovy/util/JavadocAssertionTestSuite.groovy | 0
.../main/groovy/groovy/util/StringTestUtil.groovy | 0
.../mock/interceptor/MockProxyMetaClass.java | 0
.../src/main/java/groovy/test/GroovyAssert.java | 0
.../java/groovy/transform/NotYetImplemented.java | 0
.../src/main/java/groovy/util/AllTestSuite.java | 0
.../src/main/java/groovy/util/GroovyAssert.java | 0
.../src/main/java/groovy/util/GroovyTestCase.java | 0
.../src/main/java/groovy/util/GroovyTestSuite.java | 0
.../codehaus/groovy/runtime/ScriptTestAdapter.java | 0
.../NotYetImplementedASTTransformation.java | 0
.../src/test/groovy/GroovyTestCaseTest.groovy | 0
.../groovy/lang/GroovyLogTestCaseTest.groovy | 0
.../src/test/groovy/groovy/lang/SpreadMapTest.java | 0
.../groovy/groovy/test/GroovyAssertTest.groovy | 0
.../groovy/groovy/util/AllTestSuiteTest.groovy | 0
.../util/suite/ATestScriptThatsNoTestCase.groovy | 0
.../NotYetImplementedTransformTest.groovy | 0
.../groovy-testng/build.gradle | 0
.../org/codehaus/groovy/testng/TestNgRunner.java | 0
.../services/org.codehaus.groovy.plugins.Runners | 0
.../groovy-xml/build.gradle | 0
.../src/main/groovy/groovy/xml/Entity.groovy | 0
.../src/main/groovy/groovy/xml/StaxBuilder.groovy | 0
.../groovy/groovy/xml/StreamingDOMBuilder.groovy | 0
.../groovy/xml/StreamingMarkupBuilder.groovy | 0
.../groovy/groovy/xml/StreamingSAXBuilder.groovy | 0
.../AbstractStreamingBuilder.groovy | 0
.../src/main/java/groovy/util/XmlNodePrinter.java | 0
.../src/main/java/groovy/util/XmlParser.java | 0
.../src/main/java/groovy/util/XmlSlurper.java | 0
.../java/groovy/util/slurpersupport/Attribute.java | 0
.../groovy/util/slurpersupport/Attributes.java | 0
.../util/slurpersupport/FilteredAttributes.java | 0
.../util/slurpersupport/FilteredNodeChildren.java | 0
.../groovy/util/slurpersupport/GPathResult.java | 0
.../util/slurpersupport/NamespaceAwareHashMap.java | 0
.../groovy/util/slurpersupport/NoChildren.java | 0
.../main/java/groovy/util/slurpersupport/Node.java | 0
.../java/groovy/util/slurpersupport/NodeChild.java | 0
.../groovy/util/slurpersupport/NodeChildren.java | 0
.../groovy/util/slurpersupport/NodeIterator.java | 0
.../groovy/util/slurpersupport/NodeParents.java | 0
.../util/slurpersupport/ReplacementNode.java | 0
.../java/groovy/util/slurpersupport/package.html | 0
.../src/main/java/groovy/xml/DOMBuilder.java | 0
.../src/main/java/groovy/xml/FactorySupport.java | 0
.../src/main/java/groovy/xml/MarkupBuilder.java | 0
.../main/java/groovy/xml/MarkupBuilderHelper.java | 0
.../src/main/java/groovy/xml/Namespace.java | 0
.../src/main/java/groovy/xml/NamespaceBuilder.java | 0
.../java/groovy/xml/NamespaceBuilderSupport.java | 0
.../src/main/java/groovy/xml/SAXBuilder.java | 0
.../src/main/java/groovy/xml/XmlUtil.java | 0
.../src/main/java/groovy/xml/dom/DOMCategory.java | 0
.../src/main/java/groovy/xml/dom/package.html | 0
.../src/main/java/groovy/xml/package.html | 0
.../streamingmarkupsupport/BaseMarkupBuilder.java | 0
.../groovy/xml/streamingmarkupsupport/Builder.java | 0
.../StreamingMarkupWriter.java | 0
.../groovy/xml/streamingmarkupsupport/package.html | 0
.../codehaus/groovy/runtime/XmlGroovyMethods.java | 0
.../org/codehaus/groovy/tools/xml/DomToGroovy.java | 0
.../groovy-xml/src/spec/doc/xml-userguide.adoc | 0
.../groovy-xml/src/spec/test/DomBuilderTest.groovy | 0
.../src/spec/test/MarkupBuilderTest2.groovy | 0
.../groovy-xml/src/spec/test/SaxBuilderTest.groovy | 0
.../spec/test/StreamingMarkupBuilderTest2.groovy | 0
.../src/spec/test/UserGuideDOMCategory.groovy | 0
.../spec/test/UserGuideMarkupBuilderTest.groovy | 0
.../UserGuideStreamingMarkupBuilderTest.groovy | 0
.../src/spec/test/UserGuideXmlParserTest.groovy | 0
.../src/spec/test/UserGuideXmlSlurperTest.groovy | 0
.../src/spec/test/UserGuideXmlUtilTest.groovy | 0
.../test/groovy/groovy/bugs/Groovy249_Bug.groovy | 0
.../test/groovy/groovy/bugs/Groovy4285Bug.groovy | 0
.../test/groovy/groovy/bugs/Groovy593_Bug.groovy | 0
.../test/groovy/groovy/bugs/Groovy_2473Bug.groovy | 0
.../test/groovy/groovy/bugs/MarkupInScriptBug.java | 0
.../test/groovy/groovy/bugs/StaticMarkupBug.groovy | 0
.../test/groovy/groovy/bugs/TedsClosureBug.groovy | 0
.../src/test/groovy/groovy/util/CustomNode.java | 0
.../test/groovy/groovy/util/CustomXmlParser.java | 0
.../groovy/groovy/util/XmlNodePrinterTest.groovy | 0
.../test/groovy/groovy/util/XmlParserTest.groovy | 0
.../test/groovy/groovy/util/XmlSlurperTest.groovy | 0
.../groovy/groovy/xml/BuilderTestSupport.groovy | 0
.../src/test/groovy/groovy/xml/DOMTest.groovy | 0
.../test/groovy/groovy/xml/FactorySupportTest.java | 0
.../groovy/xml/GpathSyntaxTestSupport.groovy | 0
.../groovy/groovy/xml/MarkupBuilderTest.groovy | 0
.../groovy/groovy/xml/MarkupWithWriterTest.groovy | 0
.../groovy/xml/MixedMarkupTestSupport.groovy | 0
.../groovy/xml/NamespaceNodeGPathTest.groovy | 0
.../groovy/groovy/xml/NamespaceNodeTest.groovy | 0
.../src/test/groovy/groovy/xml/SAXTest.groovy | 0
.../groovy/xml/StreamingMarkupBuilderTest.groovy | 0
.../groovy/xml/StreamingSAXBuilderTest.groovy | 0
.../src/test/groovy/groovy/xml/TestXmlSupport.java | 0
.../groovy/groovy/xml/TraversalTestSupport.groovy | 0
.../groovy/xml/UseMarkupWithWriterScript.groovy | 0
.../test/groovy/groovy/xml/VerboseDOMTest.groovy | 0
.../src/test/groovy/groovy/xml/XmlTest.java | 0
.../src/test/groovy/groovy/xml/XmlUtilTest.groovy | 0
.../groovy/groovy/xml/dom/DOMCategoryTest.groovy | 0
.../src/test/groovy/groovy/xml/dom/DOMTest.groovy | 0
.../groovy/groovy/xml/dom/NamespaceDOMTest.groovy | 0
.../groovy/groovy/xml/vm6/StaxBuilderTest.groovy | 0
.../groovy/benchmarks/BuilderPerfTest.groovy | 0
.../groovy/tools/xml/DomToGroovyTest.groovy | 0
.../src/test/groovy/script/AtomTestScript.groovy | 0
.../src/test/groovy/script/MarkupTestScript.groovy | 0
.../src/test/groovy/util/NavToWiki.groovy | 0
.../resources/org/codehaus/groovy/tools/xml/po.xsd | 0
.../org/codehaus/groovy/tools/xml/swing.xml | 0
.../org/codehaus/groovy/tools/xml/swing2.xml | 0
.../org/codehaus/groovy/tools/xml/test1.xml | 0
.../xdocs => xdocs}/images/groovy-logo.png | Bin
3581 files changed, 1572 insertions(+)
diff --git a/groovy/upstream/groovy-2.4.3/LICENSE b/LICENSE
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/LICENSE
rename to LICENSE
diff --git a/groovy/upstream/groovy-2.4.3/NOTICE b/NOTICE
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/NOTICE
rename to NOTICE
diff --git a/groovy/upstream/groovy-2.4.3/README.adoc b/README.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/README.adoc
rename to README.adoc
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench.groovy b/benchmark/bench.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench.groovy
rename to benchmark/bench.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/LICENSE b/benchmark/bench/LICENSE
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/LICENSE
rename to benchmark/bench/LICENSE
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/ackermann.groovy b/benchmark/bench/ackermann.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/ackermann.groovy
rename to benchmark/bench/ackermann.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/ackermann.java b/benchmark/bench/ackermann.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/ackermann.java
rename to benchmark/bench/ackermann.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/ackermann.output b/benchmark/bench/ackermann.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/ackermann.output
rename to benchmark/bench/ackermann.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/ary.groovy b/benchmark/bench/ary.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/ary.groovy
rename to benchmark/bench/ary.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/ary.java b/benchmark/bench/ary.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/ary.java
rename to benchmark/bench/ary.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/ary.output b/benchmark/bench/ary.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/ary.output
rename to benchmark/bench/ary.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/binarytrees.groovy b/benchmark/bench/binarytrees.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/binarytrees.groovy
rename to benchmark/bench/binarytrees.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/binarytrees.java b/benchmark/bench/binarytrees.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/binarytrees.java
rename to benchmark/bench/binarytrees.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/chameneos.java b/benchmark/bench/chameneos.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/chameneos.java
rename to benchmark/bench/chameneos.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/echo.java b/benchmark/bench/echo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/echo.java
rename to benchmark/bench/echo.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/echo.ouput b/benchmark/bench/echo.ouput
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/echo.ouput
rename to benchmark/bench/echo.ouput
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/except.java b/benchmark/bench/except.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/except.java
rename to benchmark/bench/except.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/except.output b/benchmark/bench/except.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/except.output
rename to benchmark/bench/except.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fannkuch.groovy b/benchmark/bench/fannkuch.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fannkuch.groovy
rename to benchmark/bench/fannkuch.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fannkuch.java b/benchmark/bench/fannkuch.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fannkuch.java
rename to benchmark/bench/fannkuch.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fannkuchredux.java b/benchmark/bench/fannkuchredux.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fannkuchredux.java
rename to benchmark/bench/fannkuchredux.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fasta.java b/benchmark/bench/fasta.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fasta.java
rename to benchmark/bench/fasta.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fibo.groovy b/benchmark/bench/fibo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fibo.groovy
rename to benchmark/bench/fibo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fibo.java b/benchmark/bench/fibo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fibo.java
rename to benchmark/bench/fibo.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/fibo.output b/benchmark/bench/fibo.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/fibo.output
rename to benchmark/bench/fibo.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/harmonic.java b/benchmark/bench/harmonic.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/harmonic.java
rename to benchmark/bench/harmonic.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hash.java b/benchmark/bench/hash.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hash.java
rename to benchmark/bench/hash.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hash.output b/benchmark/bench/hash.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hash.output
rename to benchmark/bench/hash.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hash2.java b/benchmark/bench/hash2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hash2.java
rename to benchmark/bench/hash2.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hash2.output b/benchmark/bench/hash2.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hash2.output
rename to benchmark/bench/hash2.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/heapsort.groovy b/benchmark/bench/heapsort.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/heapsort.groovy
rename to benchmark/bench/heapsort.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/heapsort.java b/benchmark/bench/heapsort.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/heapsort.java
rename to benchmark/bench/heapsort.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/heapsort.output b/benchmark/bench/heapsort.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/heapsort.output
rename to benchmark/bench/heapsort.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hello.groovy b/benchmark/bench/hello.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hello.groovy
rename to benchmark/bench/hello.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hello.java b/benchmark/bench/hello.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hello.java
rename to benchmark/bench/hello.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/hello.output b/benchmark/bench/hello.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/hello.output
rename to benchmark/bench/hello.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/knucleotide.java b/benchmark/bench/knucleotide.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/knucleotide.java
rename to benchmark/bench/knucleotide.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/lists.java b/benchmark/bench/lists.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/lists.java
rename to benchmark/bench/lists.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/lists.output b/benchmark/bench/lists.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/lists.output
rename to benchmark/bench/lists.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/magicsquares.java b/benchmark/bench/magicsquares.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/magicsquares.java
rename to benchmark/bench/magicsquares.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/mandelbrot.groovy b/benchmark/bench/mandelbrot.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/mandelbrot.groovy
rename to benchmark/bench/mandelbrot.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/mandelbrot.java b/benchmark/bench/mandelbrot.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/mandelbrot.java
rename to benchmark/bench/mandelbrot.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/matrix.java b/benchmark/bench/matrix.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/matrix.java
rename to benchmark/bench/matrix.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/matrix.output b/benchmark/bench/matrix.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/matrix.output
rename to benchmark/bench/matrix.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/message.java b/benchmark/bench/message.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/message.java
rename to benchmark/bench/message.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/meteor.java b/benchmark/bench/meteor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/meteor.java
rename to benchmark/bench/meteor.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/methcall.java b/benchmark/bench/methcall.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/methcall.java
rename to benchmark/bench/methcall.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/moments.java b/benchmark/bench/moments.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/moments.java
rename to benchmark/bench/moments.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/moments.output b/benchmark/bench/moments.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/moments.output
rename to benchmark/bench/moments.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/nbody.java b/benchmark/bench/nbody.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/nbody.java
rename to benchmark/bench/nbody.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/nestedloop.java b/benchmark/bench/nestedloop.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/nestedloop.java
rename to benchmark/bench/nestedloop.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/nestedloop.output b/benchmark/bench/nestedloop.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/nestedloop.output
rename to benchmark/bench/nestedloop.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/nsieve.groovy b/benchmark/bench/nsieve.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/nsieve.groovy
rename to benchmark/bench/nsieve.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/nsieve.java b/benchmark/bench/nsieve.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/nsieve.java
rename to benchmark/bench/nsieve.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/nsievebits.java b/benchmark/bench/nsievebits.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/nsievebits.java
rename to benchmark/bench/nsievebits.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/objinst.java b/benchmark/bench/objinst.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/objinst.java
rename to benchmark/bench/objinst.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/objinst.output b/benchmark/bench/objinst.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/objinst.output
rename to benchmark/bench/objinst.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/partialsums.java b/benchmark/bench/partialsums.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/partialsums.java
rename to benchmark/bench/partialsums.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/pidigits.java b/benchmark/bench/pidigits.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/pidigits.java
rename to benchmark/bench/pidigits.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/process.java b/benchmark/bench/process.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/process.java
rename to benchmark/bench/process.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/prodcons.java b/benchmark/bench/prodcons.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/prodcons.java
rename to benchmark/bench/prodcons.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/random.groovy b/benchmark/bench/random.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/random.groovy
rename to benchmark/bench/random.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/random.java b/benchmark/bench/random.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/random.java
rename to benchmark/bench/random.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/raytracer.java b/benchmark/bench/raytracer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/raytracer.java
rename to benchmark/bench/raytracer.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/recursive.groovy b/benchmark/bench/recursive.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/recursive.groovy
rename to benchmark/bench/recursive.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/recursive.java b/benchmark/bench/recursive.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/recursive.java
rename to benchmark/bench/recursive.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/regexdna.groovy b/benchmark/bench/regexdna.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/regexdna.groovy
rename to benchmark/bench/regexdna.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/regexdna.java b/benchmark/bench/regexdna.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/regexdna.java
rename to benchmark/bench/regexdna.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/revcomp.groovy b/benchmark/bench/revcomp.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/revcomp.groovy
rename to benchmark/bench/revcomp.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/revcomp.java b/benchmark/bench/revcomp.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/revcomp.java
rename to benchmark/bench/revcomp.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/sieve.java b/benchmark/bench/sieve.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/sieve.java
rename to benchmark/bench/sieve.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/sieve.output b/benchmark/bench/sieve.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/sieve.output
rename to benchmark/bench/sieve.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/spectralnorm.groovy b/benchmark/bench/spectralnorm.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/spectralnorm.groovy
rename to benchmark/bench/spectralnorm.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/spectralnorm.java b/benchmark/bench/spectralnorm.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/spectralnorm.java
rename to benchmark/bench/spectralnorm.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/spellcheck.java b/benchmark/bench/spellcheck.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/spellcheck.java
rename to benchmark/bench/spellcheck.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/spellcheck.output b/benchmark/bench/spellcheck.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/spellcheck.output
rename to benchmark/bench/spellcheck.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/strcat.java b/benchmark/bench/strcat.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/strcat.java
rename to benchmark/bench/strcat.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/strcat.output b/benchmark/bench/strcat.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/strcat.output
rename to benchmark/bench/strcat.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/sumcol.java b/benchmark/bench/sumcol.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/sumcol.java
rename to benchmark/bench/sumcol.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/sumcol.output b/benchmark/bench/sumcol.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/sumcol.output
rename to benchmark/bench/sumcol.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/takfp.java b/benchmark/bench/takfp.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/takfp.java
rename to benchmark/bench/takfp.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/threadring.groovy b/benchmark/bench/threadring.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/threadring.groovy
rename to benchmark/bench/threadring.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/threadring.java b/benchmark/bench/threadring.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/threadring.java
rename to benchmark/bench/threadring.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/wc.java b/benchmark/bench/wc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/wc.java
rename to benchmark/bench/wc.java
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/wc.output b/benchmark/bench/wc.output
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/wc.output
rename to benchmark/bench/wc.output
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/wordfreq.groovy b/benchmark/bench/wordfreq.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/wordfreq.groovy
rename to benchmark/bench/wordfreq.groovy
diff --git a/groovy/upstream/groovy-2.4.3/benchmark/bench/wordfreq.java b/benchmark/bench/wordfreq.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/benchmark/bench/wordfreq.java
rename to benchmark/bench/wordfreq.java
diff --git a/groovy/upstream/groovy-2.4.3/build.gradle b/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/build.gradle
rename to build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/buildSrc/build.gradle b/buildSrc/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/buildSrc/build.gradle
rename to buildSrc/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
rename to buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
diff --git a/buildSrc/src/main/java/JavadocFixTool.java b/buildSrc/src/main/java/JavadocFixTool.java
new file mode 100644
index 0000000..a85a47b
--- /dev/null
+++ b/buildSrc/src/main/java/JavadocFixTool.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * License Agreement
+ *
+ * PLEASE READ THE FOLLOWING LICENSE TERMS CAREFULLY BEFORE USING THE
+ * ACCOMPANYING PROGRAM. THESE TERMS CONSTITUTE A LEGAL AGREEMENT BETWEEN
+ * YOU AND US.
+ *
+ * "Oracle" refers to Oracle America, Inc., for and on behalf of itself and its
+ * subsidiaries and affiliates under common control. "We," "us," and "our"
+ * refers to Oracle and any Program contributors. "You" and "your" refers to
+ * the individual or entity that wishes to use the Program. "Program" refers to
+ * the Java API Documentation Updater Tool, Copyright (c) 2013, Oracle America,
+ * Inc., and updates or error corrections provided by Oracle or contributors.
+ *
+ * WARNING:
+ * The Program will analyze directory information on your computer
+ * system and may modify software components on such computer system. You
+ * should only use the Program on computer systems that you maintain sufficient
+ * rights to update software components.
+ *
+ * If your computer system is owned by a person or entity other than you,
+ * you should check with such person or entity before using the Program.
+ *
+ * It is possible that you may lose some software functionality, and make
+ * Java API Documentation pages unusable on your computer system after you use
+ * the Program to update software components.
+ *
+ * License Rights and Obligations
+ * We grant you a perpetual, nonexclusive, limited license to use, modify and
+ * distribute the Program in binary and/or source code form, only for the
+ * purpose of analyzing the directory structure of your computer system and
+ * updating Java API Documentation files. If you distribute the Program, in
+ * either or both binary or source form, including as modified by you, you
+ * shall include this License Agreement ("Agreement") with your distribution.
+ *
+ * All rights not expressly granted above are hereby reserved. If you want to
+ * use the Program for any purpose other than as permitted under this
+ * Agreement, you must obtain a valid license permitting such use from Oracle.
+ * Neither the name of Oracle nor the names of any Program contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * Ownership and Restrictions
+ * We retain all ownership and intellectual property rights in the Program as
+ * provided by us. You retain all ownership and intellectual property rights
+ * in your modifications.
+ *
+ * Export
+ * You agree to comply fully with export laws and regulations of the United
+ * States and any other applicable export laws ("Export Laws") to assure that
+ * neither the Program nor any direct products thereof are: (1) exported,
+ * directly or indirectly, in violation of this Agreement or Export Laws; or
+ * (2) used for any purposes prohibited by the Export Laws, including, without
+ * limitation, nuclear, chemical, or biological weapons proliferation, or
+ * development of missile technology.
+ *
+ * Disclaimer of Warranty and Limitation of Liability
+ * THE PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. USE AT YOUR
+ * OWN RISK. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED,
+ * INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+ *
+ * IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, DIRECT, INCIDENTAL,
+ * SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS,
+ * REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN
+ * ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGES. ORACLE SHALL HAVE NO LIABILITY FOR MODIFICATIONS MADE BY
+ * YOU OR ANY THIRD PARTY.
+ *
+ * Entire Agreement
+ * You agree that this Agreement is the complete agreement for the Program, and
+ * this Agreement supersedes all prior or contemporaneous agreements or
+ * representations. If any term of this Agreement is found to be invalid or
+ * unenforceable, the remaining provisions will remain effective. This
+ * Agreement is governed by the substantive and procedural laws of California.
+ * You and Oracle agree to submit to the exclusive jurisdiction of, and venue
+ * in, the courts of San Francisco or Santa Clara counties in California in
+ * any dispute between you and Oracle arising out of or relating to this
+ * Agreement.
+ *
+ * Last updated: 14 June 2013
+ */
+import java.io.*;
+
+/*
+ * Tool for finding and addressing files related to CVE-2013-1571.
+ * See README file for details.
+ */
+public class JavadocFixTool {
+ // Usual suspects
+ private static final String[] fileNames = {"index.html",
+ "index.htm",
+ "toc.html",
+ "toc.htm"};
+
+ // If we locate this function but not validURL - we are in trouble
+ private final String patchString = "function loadFrames() {";
+ // Main fix - should be inserted before the loadFrames() function alongside
+ // the code that calls this function
+ private static final String[] patchData =
+ {" if (targetPage != \"\" && !validURL(targetPage))",
+ " targetPage = \"undefined\";",
+ " function validURL(url) {",
+ " var pos = url.indexOf(\".html\");",
+ " if (pos == -1 || pos != url.length - 5)",
+ " return false;",
+ " var allowNumber = false;",
+ " var allowSep = false;",
+ " var seenDot = false;",
+ " for (var i = 0; i < url.length - 5; i++) {",
+ " var ch = url.charAt(i);",
+ " if ('a' <= ch && ch <= 'z' ||",
+ " 'A' <= ch && ch <= 'Z' ||",
+ " ch == '$' ||",
+ " ch == '_') {",
+ " allowNumber = true;",
+ " allowSep = true;",
+ " } else if ('0' <= ch && ch <= '9'",
+ " || ch == '-') {",
+ " if (!allowNumber)",
+ " return false;",
+ " } else if (ch == '/' || ch == '.') {",
+ " if (!allowSep)",
+ " return false;",
+ " allowNumber = false;",
+ " allowSep = false;",
+ " if (ch == '.')",
+ " seenDot = true;",
+ " if (ch == '/' && seenDot)",
+ " return false;",
+ " } else {",
+ " return false;",
+ " }",
+ " }",
+ " return true;",
+ " }",
+ " function loadFrames() {"};
+
+ private final String quickFixString = "if (!(url.indexOf(\".html\") == url.length - 5))";
+ private final String[] quickFix = {" var pos = url.indexOf(\".html\");",
+ " if (pos == -1 || pos != url.length - 5)"};
+ private static String readme = null;
+ private static String version = "Java Documentation Updater Tool version 1.2 06/14/2013\n";
+
+ private static boolean doPatch = true; // By default patch file
+ private static boolean recursive = false; // By default only look in the folder in parameter
+
+ public static void main(String[] args) {
+ System.out.println(version);
+
+ if (args.length < 1) {
+ // No arguments - lazily initialize readme, print readme and usage
+ initReadme();
+ if (readme != null) {
+ System.out.println(readme);
+ }
+ printUsage(System.out);
+ return;
+ }
+
+ // Last argument should be a path to the document root
+ String name = args[args.length-1];
+
+ // Analyze the rest of parameters
+ for (int i = 0 ; i < args.length -1; i++) {
+ if ("-R".equalsIgnoreCase(args[i])) {
+ recursive = true;
+ } else if ("-C".equalsIgnoreCase(args[i])) {
+ doPatch = false;
+ } else {
+ System.err.println("Unknown option passed: "+args[i]);
+ printUsage(System.err);
+ return;
+ }
+ }
+ new JavadocFixTool().proceed(name);
+ }
+
+ /*
+ * Print usage information into the provided PrintStream
+ * @param out PrintStream to write usage information
+ */
+ public static void printUsage(PrintStream out) {
+ out.println("Usage: java -jar JavadocPatchTool.jar [-R] [-C] <Path to Javadoc root>");
+ out.println(" -R : Proceed recursively starting from given folder");
+ out.println(" -C : Check only - program will find vulnerable files and print their full paths");
+ }
+
+ /*
+ * Lazily initialize the readme document, reading it from README file inside the jar
+ */
+ public static void initReadme() {
+ try {
+ InputStream readmeStream = JavadocFixTool.class.getResourceAsStream("/README");
+ if (readmeStream != null) {
+ BufferedReader readmeReader = new BufferedReader(new InputStreamReader(readmeStream));
+ StringBuilder readmeBuilder = new StringBuilder();
+ String s;
+ while ((s = readmeReader.readLine()) != null) {
+ readmeBuilder.append(s);
+ readmeBuilder.append("\n");
+ }
+ readme = readmeBuilder.toString();
+ }
+ } catch (IOException ignore) {} // Ignore exception - readme not initialized
+ }
+
+ /*
+ * Main procedure - proceed with the searching and/or fixing depending on
+ * the command line parameters
+ * @param name Path to the document root
+ */
+ public void proceed(String name) {
+ try {
+ File folder = new File(name);
+ if (folder.exists() && folder.isDirectory() && folder.canRead()) {
+ searchAndPatch(folder);
+ } else {
+ System.err.println("Invalid folder in parameter \""+name+"\"");
+ printUsage(System.err);
+ }
+ } catch (Exception ignored) {} // Die silently
+ }
+
+ /*
+ * Find all the files that match the list given in the fileNames array.
+ * If file found attempt to patch it.
+ * If global parameter recursive is set to true attempt to go into the enclosed subfolders
+ * otherwise only patch said files in the folder directly pointed in parameter.
+ */
+ public void searchAndPatch(File folder) {
+ if (folder == null || !folder.isDirectory() || folder.list() == null) {
+ // Silently return
+ return;
+ }
+
+ for (File file : folder.listFiles()) {
+ if (file.isDirectory()) {
+ if(recursive) {
+ searchAndPatch(file);
+ }
+ continue;
+ }
+ String name = file.getName();
+ for (String s : fileNames) {
+ if (s.equalsIgnoreCase(name)) {
+ try {
+ applyPatch(file, folder);
+ } catch (Exception ex) {
+ String filePath;
+ try {
+ filePath = file.getCanonicalPath();
+ } catch (IOException ioe) {
+ System.err.println("Can not resolve path to "+file.getName()+" in folder "+folder.getName());
+ continue;
+ }
+ System.err.println("Patch failed on: "+filePath+" due to the "+ex);
+ }
+ }
+ }
+ }
+ }
+
+ /*
+ * Try to apply patch to the single file in the specific folder
+ * If global parameter doPatch is false we should only print the location of the vulnerable html file
+ * and return
+ */
+ public void applyPatch(File file, File currentFolder) throws Exception {
+ FileInputStream fis = new FileInputStream(file);
+ BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+ String line;
+ String failedString = patchString;
+ String[] patch = patchData;
+ // Attempt to look if file is vulnerable
+ for (int i = 0 ; i < 80 ; i++) { // Check first 80 lines - if there is no signature it is not our file
+ line = br.readLine();
+ if (line == null) {
+ // File less than 80 lines long, no signature encountered
+ return;
+ }
+ if (line.trim().equals("function validURL(url) {")) { // Already patched
+ failedString = null;
+ patch = null;
+ continue;
+ }
+ if (line.trim().equals(quickFixString)) { // The patch had famous 2-letter bug, update it
+ failedString = quickFixString;
+ patch = quickFix;
+ continue;
+ }
+ if (line.trim().equals("function loadFrames() {")) {
+ fis.close(); // It should not interfere with the file renaming process
+ if (failedString != null) {
+ // Vulnerable file
+ if (!doPatch) { // Report and return
+ System.out.println("Vulnerable file found: "+file.getCanonicalPath());
+ } else {
+ replaceStringInFile(currentFolder, file, failedString, patch);
+ }
+ }
+ return;
+ }
+ }
+ }
+
+ /*
+ * Replace one line in the given file in the given folder with the lines given
+ * @param folder Folder in which file should be created
+ * @param file Original file to patch
+ * @param template Trimmed String with the pattern we are have to find
+ * @param replacement Array of String that has to be written in the place of first line matching the template
+ */
+ public void replaceStringInFile(File folder, File file, String template, String[] replacement)
+ throws IOException {
+ System.out.println("Patching file: "+file.getCanonicalPath());
+ String name = file.getName();
+ File origFile = new File(folder, name+".orig");
+ file.renameTo(origFile);
+ File temporaryFile = new File(folder, name+".tmp");
+ if (temporaryFile.exists()) {
+ temporaryFile.delete();
+ }
+ temporaryFile.createNewFile();
+ String line;
+ FileInputStream fis = new FileInputStream(origFile);
+ PrintWriter pw = new PrintWriter(temporaryFile);
+ BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+ while ((line = br.readLine()) != null) {
+ if (line.trim().equals(template)) {
+ for (String s : replacement) {
+ pw.println(s);
+ }
+ } else {
+ pw.println(line);
+ }
+ }
+ pw.flush();
+ pw.close();
+ if (!temporaryFile.renameTo(new File(folder, name))) {
+ throw new IOException("Unable to rename file in folder "+folder.getName()+
+ " from \""+temporaryFile.getName()+"\" into \""+name +
+ "\n Original file saved as "+origFile.getName());
+ }
+ origFile.delete();
+ }
+}
diff --git a/groovy/upstream/groovy-2.4.3/config/binarycompatibility/binarycompat-report.groovy b/config/binarycompatibility/binarycompat-report.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/binarycompatibility/binarycompat-report.groovy
rename to config/binarycompatibility/binarycompat-report.groovy
diff --git a/groovy/upstream/groovy-2.4.3/config/bnd/groovy-all.bnd b/config/bnd/groovy-all.bnd
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/bnd/groovy-all.bnd
rename to config/bnd/groovy-all.bnd
diff --git a/groovy/upstream/groovy-2.4.3/config/bnd/groovy.bnd b/config/bnd/groovy.bnd
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/bnd/groovy.bnd
rename to config/bnd/groovy.bnd
diff --git a/groovy/upstream/groovy-2.4.3/config/build/ANTLR-LICENSE.txt b/config/build/ANTLR-LICENSE.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/build/ANTLR-LICENSE.txt
rename to config/build/ANTLR-LICENSE.txt
diff --git a/groovy/upstream/groovy-2.4.3/config/build/ASM-LICENSE.txt b/config/build/ASM-LICENSE.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/build/ASM-LICENSE.txt
rename to config/build/ASM-LICENSE.txt
diff --git a/groovy/upstream/groovy-2.4.3/config/build/JSR223-LICENSE.txt b/config/build/JSR223-LICENSE.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/build/JSR223-LICENSE.txt
rename to config/build/JSR223-LICENSE.txt
diff --git a/groovy/upstream/groovy-2.4.3/config/checkstyle/checkstyle-report.groovy b/config/checkstyle/checkstyle-report.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/checkstyle/checkstyle-report.groovy
rename to config/checkstyle/checkstyle-report.groovy
diff --git a/groovy/upstream/groovy-2.4.3/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/checkstyle/checkstyle.xml
rename to config/checkstyle/checkstyle.xml
diff --git a/groovy/upstream/groovy-2.4.3/config/checkstyle/codeHeader.txt b/config/checkstyle/codeHeader.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/checkstyle/codeHeader.txt
rename to config/checkstyle/codeHeader.txt
diff --git a/groovy/upstream/groovy-2.4.3/config/codenarc/codenarc.groovy b/config/codenarc/codenarc.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/config/codenarc/codenarc.groovy
rename to config/codenarc/codenarc.groovy
diff --git a/groovy/upstream/groovy-2.4.3/gradle.properties b/gradle.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle.properties
rename to gradle.properties
diff --git a/groovy/upstream/groovy-2.4.3/gradle/LICENSE.txt b/gradle/LICENSE.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/LICENSE.txt
rename to gradle/LICENSE.txt
diff --git a/groovy/upstream/groovy-2.4.3/gradle/asciidoctor.gradle b/gradle/asciidoctor.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/asciidoctor.gradle
rename to gradle/asciidoctor.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/assemble.gradle b/gradle/assemble.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/assemble.gradle
rename to gradle/assemble.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/backports.gradle b/gradle/backports.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/backports.gradle
rename to gradle/backports.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/binarycompatibility.gradle b/gradle/binarycompatibility.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/binarycompatibility.gradle
rename to gradle/binarycompatibility.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/bintray.gradle b/gradle/bintray.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/bintray.gradle
rename to gradle/bintray.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/codehaus.gradle b/gradle/codehaus.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/codehaus.gradle
rename to gradle/codehaus.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/docs.gradle b/gradle/docs.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/docs.gradle
rename to gradle/docs.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/eclipse.gradle b/gradle/eclipse.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/eclipse.gradle
rename to gradle/eclipse.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/filter.gradle b/gradle/filter.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/filter.gradle
rename to gradle/filter.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/groovydoc.gradle b/gradle/groovydoc.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/groovydoc.gradle
rename to gradle/groovydoc.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/idea.gradle b/gradle/idea.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/idea.gradle
rename to gradle/idea.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/indy.gradle b/gradle/indy.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/indy.gradle
rename to gradle/indy.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/jacoco/jacoco.gradle b/gradle/jacoco/jacoco.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/jacoco/jacoco.gradle
rename to gradle/jacoco/jacoco.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/jacoco/jacocofix.gradle b/gradle/jacoco/jacocofix.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/jacoco/jacocofix.gradle
rename to gradle/jacoco/jacocofix.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/pomconfigurer.gradle
rename to gradle/pomconfigurer.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/quality.gradle b/gradle/quality.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/quality.gradle
rename to gradle/quality.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/test.gradle b/gradle/test.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/test.gradle
rename to gradle/test.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/upload.gradle b/gradle/upload.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/upload.gradle
rename to gradle/upload.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/utils.gradle b/gradle/utils.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/utils.gradle
rename to gradle/utils.gradle
diff --git a/groovy/upstream/groovy-2.4.3/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/groovy/upstream/groovy-2.4.3/gradlew b/gradlew
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradlew
rename to gradlew
diff --git a/groovy/upstream/groovy-2.4.3/gradlew.bat b/gradlew.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/gradlew.bat
rename to gradlew.bat
diff --git a/groovy/upstream/groovy-2.4.3/security/groovy.policy b/security/groovy.policy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/security/groovy.policy
rename to security/groovy.policy
diff --git a/groovy/upstream/groovy-2.4.3/security/groovykeys b/security/groovykeys
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/security/groovykeys
rename to security/groovykeys
diff --git a/groovy/upstream/groovy-2.4.3/settings.gradle b/settings.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/settings.gradle
rename to settings.gradle
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/grape b/src/bin/grape
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/grape
rename to src/bin/grape
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/grape.bat b/src/bin/grape.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/grape.bat
rename to src/bin/grape.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovy b/src/bin/groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovy
rename to src/bin/groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovy.bat b/src/bin/groovy.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovy.bat
rename to src/bin/groovy.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovy.icns b/src/bin/groovy.icns
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovy.icns
rename to src/bin/groovy.icns
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovyConsole b/src/bin/groovyConsole
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovyConsole
rename to src/bin/groovyConsole
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovyConsole.bat b/src/bin/groovyConsole.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovyConsole.bat
rename to src/bin/groovyConsole.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovyc b/src/bin/groovyc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovyc
rename to src/bin/groovyc
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovyc.bat b/src/bin/groovyc.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovyc.bat
rename to src/bin/groovyc.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovydoc b/src/bin/groovydoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovydoc
rename to src/bin/groovydoc
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovydoc.bat b/src/bin/groovydoc.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovydoc.bat
rename to src/bin/groovydoc.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovysh b/src/bin/groovysh
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovysh
rename to src/bin/groovysh
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/groovysh.bat b/src/bin/groovysh.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/groovysh.bat
rename to src/bin/groovysh.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/java2groovy b/src/bin/java2groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/java2groovy
rename to src/bin/java2groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/java2groovy.bat b/src/bin/java2groovy.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/java2groovy.bat
rename to src/bin/java2groovy.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/startGroovy b/src/bin/startGroovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/startGroovy
rename to src/bin/startGroovy
diff --git a/groovy/upstream/groovy-2.4.3/src/bin/startGroovy.bat b/src/bin/startGroovy.bat
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/bin/startGroovy.bat
rename to src/bin/startGroovy.bat
diff --git a/groovy/upstream/groovy-2.4.3/src/conf/groovy-starter.conf b/src/conf/groovy-starter.conf
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/conf/groovy-starter.conf
rename to src/conf/groovy-starter.conf
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/astbuilder/Main.groovy b/src/examples/astbuilder/Main.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/astbuilder/Main.groovy
rename to src/examples/astbuilder/Main.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/astbuilder/MainExample.groovy b/src/examples/astbuilder/MainExample.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/astbuilder/MainExample.groovy
rename to src/examples/astbuilder/MainExample.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/astbuilder/MainIntegrationTest.groovy b/src/examples/astbuilder/MainIntegrationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/astbuilder/MainIntegrationTest.groovy
rename to src/examples/astbuilder/MainIntegrationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/astbuilder/MainTransformation.groovy b/src/examples/astbuilder/MainTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/astbuilder/MainTransformation.groovy
rename to src/examples/astbuilder/MainTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/astbuilder/build.xml b/src/examples/astbuilder/build.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/astbuilder/build.xml
rename to src/examples/astbuilder/build.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/astbuilder/readme.txt b/src/examples/astbuilder/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/astbuilder/readme.txt
rename to src/examples/astbuilder/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/AntMap.groovy b/src/examples/commandLineTools/AntMap.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/AntMap.groovy
rename to src/examples/commandLineTools/AntMap.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/BigTests.groovy b/src/examples/commandLineTools/BigTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/BigTests.groovy
rename to src/examples/commandLineTools/BigTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/ListFiles.groovy b/src/examples/commandLineTools/ListFiles.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/ListFiles.groovy
rename to src/examples/commandLineTools/ListFiles.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/Reflections.groovy b/src/examples/commandLineTools/Reflections.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/Reflections.groovy
rename to src/examples/commandLineTools/Reflections.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/SimpleWebServer.groovy b/src/examples/commandLineTools/SimpleWebServer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/commandLineTools/SimpleWebServer.groovy
rename to src/examples/commandLineTools/SimpleWebServer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/console/MortgageCalculator.groovy b/src/examples/console/MortgageCalculator.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/console/MortgageCalculator.groovy
rename to src/examples/console/MortgageCalculator.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/console/knowYourTables.groovy b/src/examples/console/knowYourTables.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/console/knowYourTables.groovy
rename to src/examples/console/knowYourTables.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/console/thinkOfANumber.groovy b/src/examples/console/thinkOfANumber.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/console/thinkOfANumber.groovy
rename to src/examples/console/thinkOfANumber.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/j2ee/CreateData.groovy b/src/examples/groovy/j2ee/CreateData.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/j2ee/CreateData.groovy
rename to src/examples/groovy/j2ee/CreateData.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/j2ee/J2eeConsole.java b/src/examples/groovy/j2ee/J2eeConsole.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/j2ee/J2eeConsole.java
rename to src/examples/groovy/j2ee/J2eeConsole.java
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/model/MvcDemo.groovy b/src/examples/groovy/model/MvcDemo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/model/MvcDemo.groovy
rename to src/examples/groovy/model/MvcDemo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/Demo.java b/src/examples/groovy/swing/Demo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/Demo.java
rename to src/examples/groovy/swing/Demo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/MyTableModel.java b/src/examples/groovy/swing/MyTableModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/MyTableModel.java
rename to src/examples/groovy/swing/MyTableModel.java
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/SwingDemo.groovy b/src/examples/groovy/swing/SwingDemo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/SwingDemo.groovy
rename to src/examples/groovy/swing/SwingDemo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/TableDemo.groovy b/src/examples/groovy/swing/TableDemo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/TableDemo.groovy
rename to src/examples/groovy/swing/TableDemo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/TableLayoutDemo.groovy b/src/examples/groovy/swing/TableLayoutDemo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy/swing/TableLayoutDemo.groovy
rename to src/examples/groovy/swing/TableLayoutDemo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovy2d/paintingByNumbers.groovy b/src/examples/groovy2d/paintingByNumbers.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovy2d/paintingByNumbers.groovy
rename to src/examples/groovy2d/paintingByNumbers.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovyShell/ArithmeticShell.groovy b/src/examples/groovyShell/ArithmeticShell.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovyShell/ArithmeticShell.groovy
rename to src/examples/groovyShell/ArithmeticShell.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovyShell/ArithmeticShellTest.groovy b/src/examples/groovyShell/ArithmeticShellTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovyShell/ArithmeticShellTest.groovy
rename to src/examples/groovyShell/ArithmeticShellTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovyShell/BlacklistingShell.groovy b/src/examples/groovyShell/BlacklistingShell.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovyShell/BlacklistingShell.groovy
rename to src/examples/groovyShell/BlacklistingShell.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/groovyShell/BlacklistingShellTest.groovy b/src/examples/groovyShell/BlacklistingShellTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/groovyShell/BlacklistingShellTest.groovy
rename to src/examples/groovyShell/BlacklistingShellTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/org/codehaus/groovy/grails/compiler/injection/DefaultGrailsDomainClassInjector.java b/src/examples/org/codehaus/groovy/grails/compiler/injection/DefaultGrailsDomainClassInjector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/org/codehaus/groovy/grails/compiler/injection/DefaultGrailsDomainClassInjector.java
rename to src/examples/org/codehaus/groovy/grails/compiler/injection/DefaultGrailsDomainClassInjector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/org/codehaus/groovy/grails/compiler/injection/DomainClass.java b/src/examples/org/codehaus/groovy/grails/compiler/injection/DomainClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/org/codehaus/groovy/grails/compiler/injection/DomainClass.java
rename to src/examples/org/codehaus/groovy/grails/compiler/injection/DomainClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/build.properties b/src/examples/osgi/build.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/build.properties
rename to src/examples/osgi/build.properties
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/build.xml b/src/examples/osgi/build.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/build.xml
rename to src/examples/osgi/build.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/Activator.groovy b/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/Activator.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/Activator.groovy
rename to src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/Activator.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeter.groovy b/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeter.groovy
rename to src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeterImpl.groovy b/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeterImpl.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeterImpl.groovy
rename to src/examples/osgi/hello-groovy-bundle/org/codehaus/groovy/osgi/GroovyGreeterImpl.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-test-harness/org/codehaus/groovy/osgi/harness/HarnessActivator.groovy b/src/examples/osgi/hello-groovy-test-harness/org/codehaus/groovy/osgi/harness/HarnessActivator.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/hello-groovy-test-harness/org/codehaus/groovy/osgi/harness/HarnessActivator.groovy
rename to src/examples/osgi/hello-groovy-test-harness/org/codehaus/groovy/osgi/harness/HarnessActivator.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/osgi/readme.txt b/src/examples/osgi/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/osgi/readme.txt
rename to src/examples/osgi/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/searchEngine/Indexer.groovy b/src/examples/searchEngine/Indexer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/searchEngine/Indexer.groovy
rename to src/examples/searchEngine/Indexer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/searchEngine/Searcher.groovy b/src/examples/searchEngine/Searcher.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/searchEngine/Searcher.groovy
rename to src/examples/searchEngine/Searcher.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/BindingExample.groovy b/src/examples/swing/BindingExample.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/BindingExample.groovy
rename to src/examples/swing/BindingExample.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/BloglinesClient.groovy b/src/examples/swing/BloglinesClient.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/BloglinesClient.groovy
rename to src/examples/swing/BloglinesClient.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/ModelNodeExample.groovy b/src/examples/swing/ModelNodeExample.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/ModelNodeExample.groovy
rename to src/examples/swing/ModelNodeExample.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/RegexCoach.groovy b/src/examples/swing/RegexCoach.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/RegexCoach.groovy
rename to src/examples/swing/RegexCoach.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/RegexCoachController.groovy b/src/examples/swing/RegexCoachController.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/RegexCoachController.groovy
rename to src/examples/swing/RegexCoachController.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/RegexCoachView.groovy b/src/examples/swing/RegexCoachView.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/RegexCoachView.groovy
rename to src/examples/swing/RegexCoachView.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/Widgets.groovy b/src/examples/swing/Widgets.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/Widgets.groovy
rename to src/examples/swing/Widgets.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/Caricature.groovy b/src/examples/swing/binding/caricature/Caricature.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/Caricature.groovy
rename to src/examples/swing/binding/caricature/Caricature.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/JCaricature.java b/src/examples/swing/binding/caricature/JCaricature.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/JCaricature.java
rename to src/examples/swing/binding/caricature/JCaricature.java
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes1.gif b/src/examples/swing/binding/caricature/resources/eyes1.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes1.gif
rename to src/examples/swing/binding/caricature/resources/eyes1.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes2.gif b/src/examples/swing/binding/caricature/resources/eyes2.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes2.gif
rename to src/examples/swing/binding/caricature/resources/eyes2.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes3.gif b/src/examples/swing/binding/caricature/resources/eyes3.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes3.gif
rename to src/examples/swing/binding/caricature/resources/eyes3.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes4.gif b/src/examples/swing/binding/caricature/resources/eyes4.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes4.gif
rename to src/examples/swing/binding/caricature/resources/eyes4.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes5.gif b/src/examples/swing/binding/caricature/resources/eyes5.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/eyes5.gif
rename to src/examples/swing/binding/caricature/resources/eyes5.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face1.gif b/src/examples/swing/binding/caricature/resources/face1.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face1.gif
rename to src/examples/swing/binding/caricature/resources/face1.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face2.gif b/src/examples/swing/binding/caricature/resources/face2.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face2.gif
rename to src/examples/swing/binding/caricature/resources/face2.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face3.gif b/src/examples/swing/binding/caricature/resources/face3.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face3.gif
rename to src/examples/swing/binding/caricature/resources/face3.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face4.gif b/src/examples/swing/binding/caricature/resources/face4.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face4.gif
rename to src/examples/swing/binding/caricature/resources/face4.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face5.gif b/src/examples/swing/binding/caricature/resources/face5.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/face5.gif
rename to src/examples/swing/binding/caricature/resources/face5.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/glasses.gif b/src/examples/swing/binding/caricature/resources/glasses.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/glasses.gif
rename to src/examples/swing/binding/caricature/resources/glasses.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/glassesWEyes.gif b/src/examples/swing/binding/caricature/resources/glassesWEyes.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/glassesWEyes.gif
rename to src/examples/swing/binding/caricature/resources/glassesWEyes.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair1.gif b/src/examples/swing/binding/caricature/resources/hair1.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair1.gif
rename to src/examples/swing/binding/caricature/resources/hair1.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair2.gif b/src/examples/swing/binding/caricature/resources/hair2.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair2.gif
rename to src/examples/swing/binding/caricature/resources/hair2.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair3.gif b/src/examples/swing/binding/caricature/resources/hair3.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair3.gif
rename to src/examples/swing/binding/caricature/resources/hair3.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair4.gif b/src/examples/swing/binding/caricature/resources/hair4.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair4.gif
rename to src/examples/swing/binding/caricature/resources/hair4.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair5.gif b/src/examples/swing/binding/caricature/resources/hair5.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/hair5.gif
rename to src/examples/swing/binding/caricature/resources/hair5.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth1.gif b/src/examples/swing/binding/caricature/resources/mouth1.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth1.gif
rename to src/examples/swing/binding/caricature/resources/mouth1.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth2.gif b/src/examples/swing/binding/caricature/resources/mouth2.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth2.gif
rename to src/examples/swing/binding/caricature/resources/mouth2.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth3.gif b/src/examples/swing/binding/caricature/resources/mouth3.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth3.gif
rename to src/examples/swing/binding/caricature/resources/mouth3.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth4.gif b/src/examples/swing/binding/caricature/resources/mouth4.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth4.gif
rename to src/examples/swing/binding/caricature/resources/mouth4.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth5.gif b/src/examples/swing/binding/caricature/resources/mouth5.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/mouth5.gif
rename to src/examples/swing/binding/caricature/resources/mouth5.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose1.gif b/src/examples/swing/binding/caricature/resources/nose1.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose1.gif
rename to src/examples/swing/binding/caricature/resources/nose1.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose2.gif b/src/examples/swing/binding/caricature/resources/nose2.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose2.gif
rename to src/examples/swing/binding/caricature/resources/nose2.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose3.gif b/src/examples/swing/binding/caricature/resources/nose3.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose3.gif
rename to src/examples/swing/binding/caricature/resources/nose3.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose4.gif b/src/examples/swing/binding/caricature/resources/nose4.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose4.gif
rename to src/examples/swing/binding/caricature/resources/nose4.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose5.gif b/src/examples/swing/binding/caricature/resources/nose5.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/binding/caricature/resources/nose5.gif
rename to src/examples/swing/binding/caricature/resources/nose5.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/greet/Greet.groovy b/src/examples/swing/greet/Greet.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/greet/Greet.groovy
rename to src/examples/swing/greet/Greet.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/greet/TwitterAPI.groovy b/src/examples/swing/greet/TwitterAPI.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/greet/TwitterAPI.groovy
rename to src/examples/swing/greet/TwitterAPI.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/greet/View.groovy b/src/examples/swing/greet/View.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/greet/View.groovy
rename to src/examples/swing/greet/View.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/timelog/TimeLogMain.groovy b/src/examples/swing/timelog/TimeLogMain.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/timelog/TimeLogMain.groovy
rename to src/examples/swing/timelog/TimeLogMain.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/timelog/TimeLogModel.groovy b/src/examples/swing/timelog/TimeLogModel.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/timelog/TimeLogModel.groovy
rename to src/examples/swing/timelog/TimeLogModel.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/swing/timelog/TimeLogView.groovy b/src/examples/swing/timelog/TimeLogView.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/swing/timelog/TimeLogView.groovy
rename to src/examples/swing/timelog/TimeLogView.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/CompiledAtASTTransformation.groovy b/src/examples/transforms/global/CompiledAtASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/CompiledAtASTTransformation.groovy
rename to src/examples/transforms/global/CompiledAtASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/CompiledAtExample.groovy b/src/examples/transforms/global/CompiledAtExample.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/CompiledAtExample.groovy
rename to src/examples/transforms/global/CompiledAtExample.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/CompiledAtIntegrationTest.groovy b/src/examples/transforms/global/CompiledAtIntegrationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/CompiledAtIntegrationTest.groovy
rename to src/examples/transforms/global/CompiledAtIntegrationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/LoggingASTTransformation.groovy b/src/examples/transforms/global/LoggingASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/LoggingASTTransformation.groovy
rename to src/examples/transforms/global/LoggingASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/LoggingExample.groovy b/src/examples/transforms/global/LoggingExample.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/LoggingExample.groovy
rename to src/examples/transforms/global/LoggingExample.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/examples/transforms/global/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
rename to src/examples/transforms/global/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/build.xml b/src/examples/transforms/global/build.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/build.xml
rename to src/examples/transforms/global/build.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/global/readme.txt b/src/examples/transforms/global/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/global/readme.txt
rename to src/examples/transforms/global/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/local/LoggingASTTransformation.groovy b/src/examples/transforms/local/LoggingASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/local/LoggingASTTransformation.groovy
rename to src/examples/transforms/local/LoggingASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/local/LoggingExample.groovy b/src/examples/transforms/local/LoggingExample.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/local/LoggingExample.groovy
rename to src/examples/transforms/local/LoggingExample.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/local/WithLogging.groovy b/src/examples/transforms/local/WithLogging.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/local/WithLogging.groovy
rename to src/examples/transforms/local/WithLogging.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/local/build.xml b/src/examples/transforms/local/build.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/local/build.xml
rename to src/examples/transforms/local/build.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/transforms/local/readme.txt b/src/examples/transforms/local/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/transforms/local/readme.txt
rename to src/examples/transforms/local/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/Animal.groovy b/src/examples/webapps/groovlet-examples/WEB-INF/groovy/Animal.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/Animal.groovy
rename to src/examples/webapps/groovlet-examples/WEB-INF/groovy/Animal.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/Fish.groovy b/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/Fish.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/Fish.groovy
rename to src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/Fish.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Shark.groovy b/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Shark.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Shark.groovy
rename to src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Shark.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Trout.groovy b/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Trout.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Trout.groovy
rename to src/examples/webapps/groovlet-examples/WEB-INF/groovy/zoo/fish/Trout.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/web.xml b/src/examples/webapps/groovlet-examples/WEB-INF/web.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/WEB-INF/web.xml
rename to src/examples/webapps/groovlet-examples/WEB-INF/web.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/codehaus-style.css b/src/examples/webapps/groovlet-examples/codehaus-style.css
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/codehaus-style.css
rename to src/examples/webapps/groovlet-examples/codehaus-style.css
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/hello/hello.groovy b/src/examples/webapps/groovlet-examples/hello/hello.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/hello/hello.groovy
rename to src/examples/webapps/groovlet-examples/hello/hello.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/code.gif b/src/examples/webapps/groovlet-examples/images/code.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/code.gif
rename to src/examples/webapps/groovlet-examples/images/code.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/execute.gif b/src/examples/webapps/groovlet-examples/images/execute.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/execute.gif
rename to src/examples/webapps/groovlet-examples/images/execute.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/groovy.png b/src/examples/webapps/groovlet-examples/images/groovy.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/groovy.png
rename to src/examples/webapps/groovlet-examples/images/groovy.png
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/return.gif b/src/examples/webapps/groovlet-examples/images/return.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/images/return.gif
rename to src/examples/webapps/groovlet-examples/images/return.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/index.groovy b/src/examples/webapps/groovlet-examples/index.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/index.groovy
rename to src/examples/webapps/groovlet-examples/index.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/readme.txt b/src/examples/webapps/groovlet-examples/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/readme.txt
rename to src/examples/webapps/groovlet-examples/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/xml/index.xhtml b/src/examples/webapps/groovlet-examples/xml/index.xhtml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/xml/index.xhtml
rename to src/examples/webapps/groovlet-examples/xml/index.xhtml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/zoo/HommingbergerGepardenforelle.groovy b/src/examples/webapps/groovlet-examples/zoo/HommingbergerGepardenforelle.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/zoo/HommingbergerGepardenforelle.groovy
rename to src/examples/webapps/groovlet-examples/zoo/HommingbergerGepardenforelle.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/zoo/visit.groovy b/src/examples/webapps/groovlet-examples/zoo/visit.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/zoo/visit.groovy
rename to src/examples/webapps/groovlet-examples/zoo/visit.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/zoo/zoo.groovy b/src/examples/webapps/groovlet-examples/zoo/zoo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/groovlet-examples/zoo/zoo.groovy
rename to src/examples/webapps/groovlet-examples/zoo/zoo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/gsp-examples/readme.txt b/src/examples/webapps/gsp-examples/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/gsp-examples/readme.txt
rename to src/examples/webapps/gsp-examples/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/3.times.HelloWorld.html b/src/examples/webapps/template-examples/3.times.HelloWorld.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/3.times.HelloWorld.html
rename to src/examples/webapps/template-examples/3.times.HelloWorld.html
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/WEB-INF/lib/groovy-all-xyz.jar.placeholder b/src/examples/webapps/template-examples/WEB-INF/lib/groovy-all-xyz.jar.placeholder
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/WEB-INF/lib/groovy-all-xyz.jar.placeholder
rename to src/examples/webapps/template-examples/WEB-INF/lib/groovy-all-xyz.jar.placeholder
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/WEB-INF/web.xml b/src/examples/webapps/template-examples/WEB-INF/web.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/WEB-INF/web.xml
rename to src/examples/webapps/template-examples/WEB-INF/web.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/javasystemproperties.htm b/src/examples/webapps/template-examples/javasystemproperties.htm
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/javasystemproperties.htm
rename to src/examples/webapps/template-examples/javasystemproperties.htm
diff --git a/groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/readme.txt b/src/examples/webapps/template-examples/readme.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/examples/webapps/template-examples/readme.txt
rename to src/examples/webapps/template-examples/readme.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/ref/README.txt b/src/latex/ref/README.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/ref/README.txt
rename to src/latex/ref/README.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/ref/groovy-reference-card.tex b/src/latex/ref/groovy-reference-card.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/ref/groovy-reference-card.tex
rename to src/latex/ref/groovy-reference-card.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/ref/one-groovy-logo.eps b/src/latex/ref/one-groovy-logo.eps
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/ref/one-groovy-logo.eps
rename to src/latex/ref/one-groovy-logo.eps
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/ref/one-groovy-logo.mps b/src/latex/ref/one-groovy-logo.mps
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/ref/one-groovy-logo.mps
rename to src/latex/ref/one-groovy-logo.mps
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/colophon.tex b/src/latex/spec/colophon.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/colophon.tex
rename to src/latex/spec/colophon.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/expressions.tex b/src/latex/spec/expressions.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/expressions.tex
rename to src/latex/spec/expressions.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/groovy-lang-spec.tex b/src/latex/spec/groovy-lang-spec.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/groovy-lang-spec.tex
rename to src/latex/spec/groovy-lang-spec.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/keywords.tex b/src/latex/spec/keywords.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/keywords.tex
rename to src/latex/spec/keywords.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/operators.tex b/src/latex/spec/operators.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/operators.tex
rename to src/latex/spec/operators.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/preface.tex b/src/latex/spec/preface.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/preface.tex
rename to src/latex/spec/preface.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/latex/spec/statements.tex b/src/latex/spec/statements.tex
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/latex/spec/statements.tex
rename to src/latex/spec/statements.tex
diff --git a/groovy/upstream/groovy-2.4.3/src/main/META-INF/groovy-release-info.properties b/src/main/META-INF/groovy-release-info.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/META-INF/groovy-release-info.properties
rename to src/main/META-INF/groovy-release-info.properties
diff --git a/groovy/upstream/groovy-2.4.3/src/main/META-INF/services/org.codehaus.groovy.source.Extensions b/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
rename to src/main/META-INF/services/org.codehaus.groovy.source.Extensions
diff --git a/groovy/upstream/groovy-2.4.3/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
rename to src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/Bindable.java b/src/main/groovy/beans/Bindable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/Bindable.java
rename to src/main/groovy/beans/Bindable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/BindableASTTransformation.java b/src/main/groovy/beans/BindableASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/BindableASTTransformation.java
rename to src/main/groovy/beans/BindableASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/DefaultPropertyAccessor.java b/src/main/groovy/beans/DefaultPropertyAccessor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/DefaultPropertyAccessor.java
rename to src/main/groovy/beans/DefaultPropertyAccessor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/DefaultPropertyReader.java b/src/main/groovy/beans/DefaultPropertyReader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/DefaultPropertyReader.java
rename to src/main/groovy/beans/DefaultPropertyReader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/DefaultPropertyWriter.java b/src/main/groovy/beans/DefaultPropertyWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/DefaultPropertyWriter.java
rename to src/main/groovy/beans/DefaultPropertyWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/ListenerList.groovy b/src/main/groovy/beans/ListenerList.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/ListenerList.groovy
rename to src/main/groovy/beans/ListenerList.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/ListenerListASTTransformation.groovy b/src/main/groovy/beans/ListenerListASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/ListenerListASTTransformation.groovy
rename to src/main/groovy/beans/ListenerListASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/PropertyAccessor.java b/src/main/groovy/beans/PropertyAccessor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/PropertyAccessor.java
rename to src/main/groovy/beans/PropertyAccessor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/PropertyReader.java b/src/main/groovy/beans/PropertyReader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/PropertyReader.java
rename to src/main/groovy/beans/PropertyReader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/PropertyWriter.java b/src/main/groovy/beans/PropertyWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/PropertyWriter.java
rename to src/main/groovy/beans/PropertyWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/Vetoable.java b/src/main/groovy/beans/Vetoable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/Vetoable.java
rename to src/main/groovy/beans/Vetoable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/beans/VetoableASTTransformation.java b/src/main/groovy/beans/VetoableASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/beans/VetoableASTTransformation.java
rename to src/main/groovy/beans/VetoableASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/grape/GrabAnnotationTransformation.java b/src/main/groovy/grape/GrabAnnotationTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/grape/GrabAnnotationTransformation.java
rename to src/main/groovy/grape/GrabAnnotationTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/grape/Grape.java b/src/main/groovy/grape/Grape.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/grape/Grape.java
rename to src/main/groovy/grape/Grape.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/grape/GrapeEngine.java b/src/main/groovy/grape/GrapeEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/grape/GrapeEngine.java
rename to src/main/groovy/grape/GrapeEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/grape/GrapeIvy.groovy b/src/main/groovy/grape/GrapeIvy.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/grape/GrapeIvy.groovy
rename to src/main/groovy/grape/GrapeIvy.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/inspect/Inspector.java b/src/main/groovy/inspect/Inspector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/inspect/Inspector.java
rename to src/main/groovy/inspect/Inspector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/inspect/package.html b/src/main/groovy/inspect/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/inspect/package.html
rename to src/main/groovy/inspect/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/EncodingAwareBufferedWriter.java b/src/main/groovy/io/EncodingAwareBufferedWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/EncodingAwareBufferedWriter.java
rename to src/main/groovy/io/EncodingAwareBufferedWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/FileType.java b/src/main/groovy/io/FileType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/FileType.java
rename to src/main/groovy/io/FileType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/FileVisitResult.java b/src/main/groovy/io/FileVisitResult.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/FileVisitResult.java
rename to src/main/groovy/io/FileVisitResult.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/GroovyPrintStream.java b/src/main/groovy/io/GroovyPrintStream.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/GroovyPrintStream.java
rename to src/main/groovy/io/GroovyPrintStream.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/GroovyPrintWriter.java b/src/main/groovy/io/GroovyPrintWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/GroovyPrintWriter.java
rename to src/main/groovy/io/GroovyPrintWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/LineColumnReader.java b/src/main/groovy/io/LineColumnReader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/LineColumnReader.java
rename to src/main/groovy/io/LineColumnReader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/PlatformLineWriter.java b/src/main/groovy/io/PlatformLineWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/PlatformLineWriter.java
rename to src/main/groovy/io/PlatformLineWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/io/package.html b/src/main/groovy/io/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/io/package.html
rename to src/main/groovy/io/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/AdaptingMetaClass.java b/src/main/groovy/lang/AdaptingMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/AdaptingMetaClass.java
rename to src/main/groovy/lang/AdaptingMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/BenchmarkInterceptor.java b/src/main/groovy/lang/BenchmarkInterceptor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/BenchmarkInterceptor.java
rename to src/main/groovy/lang/BenchmarkInterceptor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Binding.java b/src/main/groovy/lang/Binding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Binding.java
rename to src/main/groovy/lang/Binding.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Buildable.java b/src/main/groovy/lang/Buildable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Buildable.java
rename to src/main/groovy/lang/Buildable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Category.java b/src/main/groovy/lang/Category.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Category.java
rename to src/main/groovy/lang/Category.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Closure.java b/src/main/groovy/lang/Closure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Closure.java
rename to src/main/groovy/lang/Closure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ClosureException.java b/src/main/groovy/lang/ClosureException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ClosureException.java
rename to src/main/groovy/lang/ClosureException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ClosureInvokingMethod.java b/src/main/groovy/lang/ClosureInvokingMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ClosureInvokingMethod.java
rename to src/main/groovy/lang/ClosureInvokingMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Delegate.java b/src/main/groovy/lang/Delegate.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Delegate.java
rename to src/main/groovy/lang/Delegate.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/DelegatesTo.java b/src/main/groovy/lang/DelegatesTo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/DelegatesTo.java
rename to src/main/groovy/lang/DelegatesTo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/DelegatingMetaClass.java b/src/main/groovy/lang/DelegatingMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/DelegatingMetaClass.java
rename to src/main/groovy/lang/DelegatingMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/DeprecationException.java b/src/main/groovy/lang/DeprecationException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/DeprecationException.java
rename to src/main/groovy/lang/DeprecationException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/EmptyRange.java b/src/main/groovy/lang/EmptyRange.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/EmptyRange.java
rename to src/main/groovy/lang/EmptyRange.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ExpandoMetaClass.java b/src/main/groovy/lang/ExpandoMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ExpandoMetaClass.java
rename to src/main/groovy/lang/ExpandoMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ExpandoMetaClassCreationHandle.java b/src/main/groovy/lang/ExpandoMetaClassCreationHandle.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ExpandoMetaClassCreationHandle.java
rename to src/main/groovy/lang/ExpandoMetaClassCreationHandle.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GString.java b/src/main/groovy/lang/GString.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GString.java
rename to src/main/groovy/lang/GString.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GeneratedGroovyProxy.java b/src/main/groovy/lang/GeneratedGroovyProxy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GeneratedGroovyProxy.java
rename to src/main/groovy/lang/GeneratedGroovyProxy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Grab.java b/src/main/groovy/lang/Grab.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Grab.java
rename to src/main/groovy/lang/Grab.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GrabConfig.java b/src/main/groovy/lang/GrabConfig.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GrabConfig.java
rename to src/main/groovy/lang/GrabConfig.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GrabExclude.java b/src/main/groovy/lang/GrabExclude.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GrabExclude.java
rename to src/main/groovy/lang/GrabExclude.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GrabResolver.java b/src/main/groovy/lang/GrabResolver.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GrabResolver.java
rename to src/main/groovy/lang/GrabResolver.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Grapes.java b/src/main/groovy/lang/Grapes.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Grapes.java
rename to src/main/groovy/lang/Grapes.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyCallable.java b/src/main/groovy/lang/GroovyCallable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyCallable.java
rename to src/main/groovy/lang/GroovyCallable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyClassLoader.java b/src/main/groovy/lang/GroovyClassLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyClassLoader.java
rename to src/main/groovy/lang/GroovyClassLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyCodeSource.java b/src/main/groovy/lang/GroovyCodeSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyCodeSource.java
rename to src/main/groovy/lang/GroovyCodeSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyInterceptable.java b/src/main/groovy/lang/GroovyInterceptable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyInterceptable.java
rename to src/main/groovy/lang/GroovyInterceptable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyObject.java b/src/main/groovy/lang/GroovyObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyObject.java
rename to src/main/groovy/lang/GroovyObject.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyObjectSupport.java b/src/main/groovy/lang/GroovyObjectSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyObjectSupport.java
rename to src/main/groovy/lang/GroovyObjectSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyResourceLoader.java b/src/main/groovy/lang/GroovyResourceLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyResourceLoader.java
rename to src/main/groovy/lang/GroovyResourceLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyRuntimeException.java b/src/main/groovy/lang/GroovyRuntimeException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyRuntimeException.java
rename to src/main/groovy/lang/GroovyRuntimeException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyShell.java b/src/main/groovy/lang/GroovyShell.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovyShell.java
rename to src/main/groovy/lang/GroovyShell.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovySystem.java b/src/main/groovy/lang/GroovySystem.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/GroovySystem.java
rename to src/main/groovy/lang/GroovySystem.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/IllegalPropertyAccessException.java b/src/main/groovy/lang/IllegalPropertyAccessException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/IllegalPropertyAccessException.java
rename to src/main/groovy/lang/IllegalPropertyAccessException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/IncorrectClosureArgumentsException.java b/src/main/groovy/lang/IncorrectClosureArgumentsException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/IncorrectClosureArgumentsException.java
rename to src/main/groovy/lang/IncorrectClosureArgumentsException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/IntRange.java b/src/main/groovy/lang/IntRange.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/IntRange.java
rename to src/main/groovy/lang/IntRange.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Interceptor.java b/src/main/groovy/lang/Interceptor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Interceptor.java
rename to src/main/groovy/lang/Interceptor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Lazy.java b/src/main/groovy/lang/Lazy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Lazy.java
rename to src/main/groovy/lang/Lazy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ListWithDefault.java b/src/main/groovy/lang/ListWithDefault.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ListWithDefault.java
rename to src/main/groovy/lang/ListWithDefault.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MapWithDefault.java b/src/main/groovy/lang/MapWithDefault.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MapWithDefault.java
rename to src/main/groovy/lang/MapWithDefault.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaArrayLengthProperty.java b/src/main/groovy/lang/MetaArrayLengthProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaArrayLengthProperty.java
rename to src/main/groovy/lang/MetaArrayLengthProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaBeanProperty.java b/src/main/groovy/lang/MetaBeanProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaBeanProperty.java
rename to src/main/groovy/lang/MetaBeanProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClass.java b/src/main/groovy/lang/MetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClass.java
rename to src/main/groovy/lang/MetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassImpl.java b/src/main/groovy/lang/MetaClassImpl.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassImpl.java
rename to src/main/groovy/lang/MetaClassImpl.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassRegistry.java b/src/main/groovy/lang/MetaClassRegistry.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassRegistry.java
rename to src/main/groovy/lang/MetaClassRegistry.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassRegistryChangeEvent.java b/src/main/groovy/lang/MetaClassRegistryChangeEvent.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassRegistryChangeEvent.java
rename to src/main/groovy/lang/MetaClassRegistryChangeEvent.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassRegistryChangeEventListener.java b/src/main/groovy/lang/MetaClassRegistryChangeEventListener.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaClassRegistryChangeEventListener.java
rename to src/main/groovy/lang/MetaClassRegistryChangeEventListener.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaExpandoProperty.java b/src/main/groovy/lang/MetaExpandoProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaExpandoProperty.java
rename to src/main/groovy/lang/MetaExpandoProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaMethod.java b/src/main/groovy/lang/MetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaMethod.java
rename to src/main/groovy/lang/MetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaObjectProtocol.java b/src/main/groovy/lang/MetaObjectProtocol.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaObjectProtocol.java
rename to src/main/groovy/lang/MetaObjectProtocol.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaProperty.java b/src/main/groovy/lang/MetaProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MetaProperty.java
rename to src/main/groovy/lang/MetaProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingClassException.java b/src/main/groovy/lang/MissingClassException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingClassException.java
rename to src/main/groovy/lang/MissingClassException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingFieldException.java b/src/main/groovy/lang/MissingFieldException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingFieldException.java
rename to src/main/groovy/lang/MissingFieldException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingMethodException.java b/src/main/groovy/lang/MissingMethodException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingMethodException.java
rename to src/main/groovy/lang/MissingMethodException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingPropertyException.java b/src/main/groovy/lang/MissingPropertyException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MissingPropertyException.java
rename to src/main/groovy/lang/MissingPropertyException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Mixin.java b/src/main/groovy/lang/Mixin.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Mixin.java
rename to src/main/groovy/lang/Mixin.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MutableMetaClass.java b/src/main/groovy/lang/MutableMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/MutableMetaClass.java
rename to src/main/groovy/lang/MutableMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Newify.java b/src/main/groovy/lang/Newify.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Newify.java
rename to src/main/groovy/lang/Newify.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/NonEmptySequence.java b/src/main/groovy/lang/NonEmptySequence.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/NonEmptySequence.java
rename to src/main/groovy/lang/NonEmptySequence.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ObjectRange.java b/src/main/groovy/lang/ObjectRange.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ObjectRange.java
rename to src/main/groovy/lang/ObjectRange.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ParameterArray.java b/src/main/groovy/lang/ParameterArray.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ParameterArray.java
rename to src/main/groovy/lang/ParameterArray.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/PropertyAccessInterceptor.java b/src/main/groovy/lang/PropertyAccessInterceptor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/PropertyAccessInterceptor.java
rename to src/main/groovy/lang/PropertyAccessInterceptor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/PropertyValue.java b/src/main/groovy/lang/PropertyValue.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/PropertyValue.java
rename to src/main/groovy/lang/PropertyValue.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ProxyMetaClass.java b/src/main/groovy/lang/ProxyMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ProxyMetaClass.java
rename to src/main/groovy/lang/ProxyMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Range.java b/src/main/groovy/lang/Range.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Range.java
rename to src/main/groovy/lang/Range.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ReadOnlyPropertyException.java b/src/main/groovy/lang/ReadOnlyPropertyException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/ReadOnlyPropertyException.java
rename to src/main/groovy/lang/ReadOnlyPropertyException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Reference.java b/src/main/groovy/lang/Reference.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Reference.java
rename to src/main/groovy/lang/Reference.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Script.java b/src/main/groovy/lang/Script.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Script.java
rename to src/main/groovy/lang/Script.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Sequence.java b/src/main/groovy/lang/Sequence.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Sequence.java
rename to src/main/groovy/lang/Sequence.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Singleton.java b/src/main/groovy/lang/Singleton.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Singleton.java
rename to src/main/groovy/lang/Singleton.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/SpreadListEvaluatingException.java b/src/main/groovy/lang/SpreadListEvaluatingException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/SpreadListEvaluatingException.java
rename to src/main/groovy/lang/SpreadListEvaluatingException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/SpreadMap.java b/src/main/groovy/lang/SpreadMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/SpreadMap.java
rename to src/main/groovy/lang/SpreadMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/SpreadMapEvaluatingException.java b/src/main/groovy/lang/SpreadMapEvaluatingException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/SpreadMapEvaluatingException.java
rename to src/main/groovy/lang/SpreadMapEvaluatingException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/StringWriterIOException.java b/src/main/groovy/lang/StringWriterIOException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/StringWriterIOException.java
rename to src/main/groovy/lang/StringWriterIOException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/TracingInterceptor.java b/src/main/groovy/lang/TracingInterceptor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/TracingInterceptor.java
rename to src/main/groovy/lang/TracingInterceptor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/TrampolineClosure.java b/src/main/groovy/lang/TrampolineClosure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/TrampolineClosure.java
rename to src/main/groovy/lang/TrampolineClosure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Tuple.java b/src/main/groovy/lang/Tuple.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Tuple.java
rename to src/main/groovy/lang/Tuple.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Tuple2.java b/src/main/groovy/lang/Tuple2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Tuple2.java
rename to src/main/groovy/lang/Tuple2.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Writable.java b/src/main/groovy/lang/Writable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/Writable.java
rename to src/main/groovy/lang/Writable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/lang/package.html b/src/main/groovy/lang/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/lang/package.html
rename to src/main/groovy/lang/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/security/GroovyCodeSourcePermission.java b/src/main/groovy/security/GroovyCodeSourcePermission.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/security/GroovyCodeSourcePermission.java
rename to src/main/groovy/security/GroovyCodeSourcePermission.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/security/package.html b/src/main/groovy/security/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/security/package.html
rename to src/main/groovy/security/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/BaseDuration.java b/src/main/groovy/time/BaseDuration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/BaseDuration.java
rename to src/main/groovy/time/BaseDuration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/DatumDependentDuration.java b/src/main/groovy/time/DatumDependentDuration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/DatumDependentDuration.java
rename to src/main/groovy/time/DatumDependentDuration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/Duration.java b/src/main/groovy/time/Duration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/Duration.java
rename to src/main/groovy/time/Duration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/TimeCategory.java b/src/main/groovy/time/TimeCategory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/TimeCategory.java
rename to src/main/groovy/time/TimeCategory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/TimeDatumDependentDuration.java b/src/main/groovy/time/TimeDatumDependentDuration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/TimeDatumDependentDuration.java
rename to src/main/groovy/time/TimeDatumDependentDuration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/TimeDuration.java b/src/main/groovy/time/TimeDuration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/TimeDuration.java
rename to src/main/groovy/time/TimeDuration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/time/package.html b/src/main/groovy/time/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/time/package.html
rename to src/main/groovy/time/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ASTTest.java b/src/main/groovy/transform/ASTTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ASTTest.java
rename to src/main/groovy/transform/ASTTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AnnotationCollector.java b/src/main/groovy/transform/AnnotationCollector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AnnotationCollector.java
rename to src/main/groovy/transform/AnnotationCollector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AutoClone.java b/src/main/groovy/transform/AutoClone.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AutoClone.java
rename to src/main/groovy/transform/AutoClone.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AutoCloneStyle.java b/src/main/groovy/transform/AutoCloneStyle.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AutoCloneStyle.java
rename to src/main/groovy/transform/AutoCloneStyle.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AutoExternalize.groovy b/src/main/groovy/transform/AutoExternalize.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/AutoExternalize.groovy
rename to src/main/groovy/transform/AutoExternalize.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/BaseScript.java b/src/main/groovy/transform/BaseScript.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/BaseScript.java
rename to src/main/groovy/transform/BaseScript.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Canonical.java b/src/main/groovy/transform/Canonical.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Canonical.java
rename to src/main/groovy/transform/Canonical.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/CompilationUnitAware.java b/src/main/groovy/transform/CompilationUnitAware.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/CompilationUnitAware.java
rename to src/main/groovy/transform/CompilationUnitAware.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/CompileDynamic.groovy b/src/main/groovy/transform/CompileDynamic.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/CompileDynamic.groovy
rename to src/main/groovy/transform/CompileDynamic.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/CompileStatic.java b/src/main/groovy/transform/CompileStatic.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/CompileStatic.java
rename to src/main/groovy/transform/CompileStatic.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ConditionalInterrupt.groovy b/src/main/groovy/transform/ConditionalInterrupt.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ConditionalInterrupt.groovy
rename to src/main/groovy/transform/ConditionalInterrupt.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/EqualsAndHashCode.java b/src/main/groovy/transform/EqualsAndHashCode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/EqualsAndHashCode.java
rename to src/main/groovy/transform/EqualsAndHashCode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ExternalizeMethods.java b/src/main/groovy/transform/ExternalizeMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ExternalizeMethods.java
rename to src/main/groovy/transform/ExternalizeMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ExternalizeVerifier.java b/src/main/groovy/transform/ExternalizeVerifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ExternalizeVerifier.java
rename to src/main/groovy/transform/ExternalizeVerifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Field.java b/src/main/groovy/transform/Field.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Field.java
rename to src/main/groovy/transform/Field.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Immutable.java b/src/main/groovy/transform/Immutable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Immutable.java
rename to src/main/groovy/transform/Immutable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/IndexedProperty.java b/src/main/groovy/transform/IndexedProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/IndexedProperty.java
rename to src/main/groovy/transform/IndexedProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/InheritConstructors.java b/src/main/groovy/transform/InheritConstructors.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/InheritConstructors.java
rename to src/main/groovy/transform/InheritConstructors.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Memoized.java b/src/main/groovy/transform/Memoized.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Memoized.java
rename to src/main/groovy/transform/Memoized.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/PackageScope.java b/src/main/groovy/transform/PackageScope.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/PackageScope.java
rename to src/main/groovy/transform/PackageScope.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/PackageScopeTarget.java b/src/main/groovy/transform/PackageScopeTarget.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/PackageScopeTarget.java
rename to src/main/groovy/transform/PackageScopeTarget.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/SelfType.java b/src/main/groovy/transform/SelfType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/SelfType.java
rename to src/main/groovy/transform/SelfType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Sortable.java b/src/main/groovy/transform/Sortable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Sortable.java
rename to src/main/groovy/transform/Sortable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/SourceURI.java b/src/main/groovy/transform/SourceURI.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/SourceURI.java
rename to src/main/groovy/transform/SourceURI.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Synchronized.java b/src/main/groovy/transform/Synchronized.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Synchronized.java
rename to src/main/groovy/transform/Synchronized.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TailRecursive.groovy b/src/main/groovy/transform/TailRecursive.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TailRecursive.groovy
rename to src/main/groovy/transform/TailRecursive.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ThreadInterrupt.groovy b/src/main/groovy/transform/ThreadInterrupt.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ThreadInterrupt.groovy
rename to src/main/groovy/transform/ThreadInterrupt.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TimedInterrupt.groovy b/src/main/groovy/transform/TimedInterrupt.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TimedInterrupt.groovy
rename to src/main/groovy/transform/TimedInterrupt.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ToString.java b/src/main/groovy/transform/ToString.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/ToString.java
rename to src/main/groovy/transform/ToString.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Trait.java b/src/main/groovy/transform/Trait.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Trait.java
rename to src/main/groovy/transform/Trait.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TupleConstructor.java b/src/main/groovy/transform/TupleConstructor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TupleConstructor.java
rename to src/main/groovy/transform/TupleConstructor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TypeChecked.java b/src/main/groovy/transform/TypeChecked.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TypeChecked.java
rename to src/main/groovy/transform/TypeChecked.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TypeCheckingMode.java b/src/main/groovy/transform/TypeCheckingMode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/TypeCheckingMode.java
rename to src/main/groovy/transform/TypeCheckingMode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Undefined.java b/src/main/groovy/transform/Undefined.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/Undefined.java
rename to src/main/groovy/transform/Undefined.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/WithReadLock.java b/src/main/groovy/transform/WithReadLock.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/WithReadLock.java
rename to src/main/groovy/transform/WithReadLock.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/WithWriteLock.java b/src/main/groovy/transform/WithWriteLock.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/WithWriteLock.java
rename to src/main/groovy/transform/WithWriteLock.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/Builder.java b/src/main/groovy/transform/builder/Builder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/Builder.java
rename to src/main/groovy/transform/builder/Builder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/DefaultStrategy.java b/src/main/groovy/transform/builder/DefaultStrategy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/DefaultStrategy.java
rename to src/main/groovy/transform/builder/DefaultStrategy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/ExternalStrategy.java b/src/main/groovy/transform/builder/ExternalStrategy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/ExternalStrategy.java
rename to src/main/groovy/transform/builder/ExternalStrategy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/InitializerStrategy.java b/src/main/groovy/transform/builder/InitializerStrategy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/InitializerStrategy.java
rename to src/main/groovy/transform/builder/InitializerStrategy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/SimpleStrategy.java b/src/main/groovy/transform/builder/SimpleStrategy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/builder/SimpleStrategy.java
rename to src/main/groovy/transform/builder/SimpleStrategy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/ClosureParams.java b/src/main/groovy/transform/stc/ClosureParams.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/ClosureParams.java
rename to src/main/groovy/transform/stc/ClosureParams.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/ClosureSignatureHint.java b/src/main/groovy/transform/stc/ClosureSignatureHint.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/ClosureSignatureHint.java
rename to src/main/groovy/transform/stc/ClosureSignatureHint.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/FirstParam.java b/src/main/groovy/transform/stc/FirstParam.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/FirstParam.java
rename to src/main/groovy/transform/stc/FirstParam.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/FromAbstractTypeMethods.java b/src/main/groovy/transform/stc/FromAbstractTypeMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/FromAbstractTypeMethods.java
rename to src/main/groovy/transform/stc/FromAbstractTypeMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/FromString.java b/src/main/groovy/transform/stc/FromString.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/FromString.java
rename to src/main/groovy/transform/stc/FromString.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/IncorrectTypeHintException.java b/src/main/groovy/transform/stc/IncorrectTypeHintException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/IncorrectTypeHintException.java
rename to src/main/groovy/transform/stc/IncorrectTypeHintException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/MapEntryOrKeyValue.java b/src/main/groovy/transform/stc/MapEntryOrKeyValue.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/MapEntryOrKeyValue.java
rename to src/main/groovy/transform/stc/MapEntryOrKeyValue.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/PickAnyArgumentHint.java b/src/main/groovy/transform/stc/PickAnyArgumentHint.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/PickAnyArgumentHint.java
rename to src/main/groovy/transform/stc/PickAnyArgumentHint.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/SecondParam.java b/src/main/groovy/transform/stc/SecondParam.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/SecondParam.java
rename to src/main/groovy/transform/stc/SecondParam.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/SimpleType.java b/src/main/groovy/transform/stc/SimpleType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/SimpleType.java
rename to src/main/groovy/transform/stc/SimpleType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/SingleSignatureClosureHint.java b/src/main/groovy/transform/stc/SingleSignatureClosureHint.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/SingleSignatureClosureHint.java
rename to src/main/groovy/transform/stc/SingleSignatureClosureHint.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/ThirdParam.java b/src/main/groovy/transform/stc/ThirdParam.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/transform/stc/ThirdParam.java
rename to src/main/groovy/transform/stc/ThirdParam.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/ui/GroovyMain.java b/src/main/groovy/ui/GroovyMain.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/ui/GroovyMain.java
rename to src/main/groovy/ui/GroovyMain.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/ui/GroovySocketServer.java b/src/main/groovy/ui/GroovySocketServer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/ui/GroovySocketServer.java
rename to src/main/groovy/ui/GroovySocketServer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/AbstractFactory.java b/src/main/groovy/util/AbstractFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/AbstractFactory.java
rename to src/main/groovy/util/AbstractFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/BuilderSupport.java b/src/main/groovy/util/BuilderSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/BuilderSupport.java
rename to src/main/groovy/util/BuilderSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/CharsetToolkit.java b/src/main/groovy/util/CharsetToolkit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/CharsetToolkit.java
rename to src/main/groovy/util/CharsetToolkit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/CliBuilder.groovy b/src/main/groovy/util/CliBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/CliBuilder.groovy
rename to src/main/groovy/util/CliBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ClosureComparator.java b/src/main/groovy/util/ClosureComparator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ClosureComparator.java
rename to src/main/groovy/util/ClosureComparator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ConfigObject.java b/src/main/groovy/util/ConfigObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ConfigObject.java
rename to src/main/groovy/util/ConfigObject.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ConfigSlurper.groovy b/src/main/groovy/util/ConfigSlurper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ConfigSlurper.groovy
rename to src/main/groovy/util/ConfigSlurper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/DelegatingScript.java b/src/main/groovy/util/DelegatingScript.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/DelegatingScript.java
rename to src/main/groovy/util/DelegatingScript.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/Eval.java b/src/main/groovy/util/Eval.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/Eval.java
rename to src/main/groovy/util/Eval.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/Expando.java b/src/main/groovy/util/Expando.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/Expando.java
rename to src/main/groovy/util/Expando.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/Factory.java b/src/main/groovy/util/Factory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/Factory.java
rename to src/main/groovy/util/Factory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/FactoryBuilderSupport.java b/src/main/groovy/util/FactoryBuilderSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/FactoryBuilderSupport.java
rename to src/main/groovy/util/FactoryBuilderSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/FileNameByRegexFinder.groovy b/src/main/groovy/util/FileNameByRegexFinder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/FileNameByRegexFinder.groovy
rename to src/main/groovy/util/FileNameByRegexFinder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/FileTreeBuilder.groovy b/src/main/groovy/util/FileTreeBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/FileTreeBuilder.groovy
rename to src/main/groovy/util/FileTreeBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/GroovyCollections.java b/src/main/groovy/util/GroovyCollections.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/GroovyCollections.java
rename to src/main/groovy/util/GroovyCollections.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/GroovyScriptEngine.java b/src/main/groovy/util/GroovyScriptEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/GroovyScriptEngine.java
rename to src/main/groovy/util/GroovyScriptEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/IFileNameFinder.java b/src/main/groovy/util/IFileNameFinder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/IFileNameFinder.java
rename to src/main/groovy/util/IFileNameFinder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/IndentPrinter.java b/src/main/groovy/util/IndentPrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/IndentPrinter.java
rename to src/main/groovy/util/IndentPrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/MapEntry.java b/src/main/groovy/util/MapEntry.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/MapEntry.java
rename to src/main/groovy/util/MapEntry.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/Node.java b/src/main/groovy/util/Node.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/Node.java
rename to src/main/groovy/util/Node.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/NodeBuilder.java b/src/main/groovy/util/NodeBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/NodeBuilder.java
rename to src/main/groovy/util/NodeBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/NodeList.java b/src/main/groovy/util/NodeList.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/NodeList.java
rename to src/main/groovy/util/NodeList.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/NodePrinter.java b/src/main/groovy/util/NodePrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/NodePrinter.java
rename to src/main/groovy/util/NodePrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObjectGraphBuilder.java b/src/main/groovy/util/ObjectGraphBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObjectGraphBuilder.java
rename to src/main/groovy/util/ObjectGraphBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObservableList.java b/src/main/groovy/util/ObservableList.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObservableList.java
rename to src/main/groovy/util/ObservableList.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObservableMap.java b/src/main/groovy/util/ObservableMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObservableMap.java
rename to src/main/groovy/util/ObservableMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObservableSet.java b/src/main/groovy/util/ObservableSet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ObservableSet.java
rename to src/main/groovy/util/ObservableSet.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/OrderBy.java b/src/main/groovy/util/OrderBy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/OrderBy.java
rename to src/main/groovy/util/OrderBy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/PermutationGenerator.java b/src/main/groovy/util/PermutationGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/PermutationGenerator.java
rename to src/main/groovy/util/PermutationGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/Proxy.java b/src/main/groovy/util/Proxy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/Proxy.java
rename to src/main/groovy/util/Proxy.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ProxyGenerator.java b/src/main/groovy/util/ProxyGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ProxyGenerator.java
rename to src/main/groovy/util/ProxyGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ResourceConnector.java b/src/main/groovy/util/ResourceConnector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ResourceConnector.java
rename to src/main/groovy/util/ResourceConnector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ResourceException.java b/src/main/groovy/util/ResourceException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ResourceException.java
rename to src/main/groovy/util/ResourceException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/ScriptException.java b/src/main/groovy/util/ScriptException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/ScriptException.java
rename to src/main/groovy/util/ScriptException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Commons.java b/src/main/groovy/util/logging/Commons.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Commons.java
rename to src/main/groovy/util/logging/Commons.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Log.java b/src/main/groovy/util/logging/Log.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Log.java
rename to src/main/groovy/util/logging/Log.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Log4j.java b/src/main/groovy/util/logging/Log4j.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Log4j.java
rename to src/main/groovy/util/logging/Log4j.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Log4j2.java b/src/main/groovy/util/logging/Log4j2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Log4j2.java
rename to src/main/groovy/util/logging/Log4j2.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Slf4j.java b/src/main/groovy/util/logging/Slf4j.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/logging/Slf4j.java
rename to src/main/groovy/util/logging/Slf4j.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/util/package.html b/src/main/groovy/util/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/util/package.html
rename to src/main/groovy/util/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/groovy/xml/QName.java b/src/main/groovy/xml/QName.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/groovy/xml/QName.java
rename to src/main/groovy/xml/QName.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/apache/commons/cli/GroovyInternalPosixParser.java b/src/main/org/apache/commons/cli/GroovyInternalPosixParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/apache/commons/cli/GroovyInternalPosixParser.java
rename to src/main/org/apache/commons/cli/GroovyInternalPosixParser.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/GroovyBugError.java b/src/main/org/codehaus/groovy/GroovyBugError.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/GroovyBugError.java
rename to src/main/org/codehaus/groovy/GroovyBugError.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/GroovyException.java b/src/main/org/codehaus/groovy/GroovyException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/GroovyException.java
rename to src/main/org/codehaus/groovy/GroovyException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/GroovyExceptionInterface.java b/src/main/org/codehaus/groovy/GroovyExceptionInterface.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/GroovyExceptionInterface.java
rename to src/main/org/codehaus/groovy/GroovyExceptionInterface.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/ASTParserException.java b/src/main/org/codehaus/groovy/antlr/ASTParserException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/ASTParserException.java
rename to src/main/org/codehaus/groovy/antlr/ASTParserException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java b/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java
rename to src/main/org/codehaus/groovy/antlr/ASTRuntimeException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrASTProcessSnippets.java b/src/main/org/codehaus/groovy/antlr/AntlrASTProcessSnippets.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrASTProcessSnippets.java
rename to src/main/org/codehaus/groovy/antlr/AntlrASTProcessSnippets.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrASTProcessor.java b/src/main/org/codehaus/groovy/antlr/AntlrASTProcessor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrASTProcessor.java
rename to src/main/org/codehaus/groovy/antlr/AntlrASTProcessor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
rename to src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrParserPluginFactory.java b/src/main/org/codehaus/groovy/antlr/AntlrParserPluginFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/AntlrParserPluginFactory.java
rename to src/main/org/codehaus/groovy/antlr/AntlrParserPluginFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/EnumHelper.java b/src/main/org/codehaus/groovy/antlr/EnumHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/EnumHelper.java
rename to src/main/org/codehaus/groovy/antlr/EnumHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java b/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/GroovySourceAST.java
rename to src/main/org/codehaus/groovy/antlr/GroovySourceAST.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/GroovySourceToken.java b/src/main/org/codehaus/groovy/antlr/GroovySourceToken.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/GroovySourceToken.java
rename to src/main/org/codehaus/groovy/antlr/GroovySourceToken.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/LexerFrame.java b/src/main/org/codehaus/groovy/antlr/LexerFrame.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/LexerFrame.java
rename to src/main/org/codehaus/groovy/antlr/LexerFrame.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/LineColumn.java b/src/main/org/codehaus/groovy/antlr/LineColumn.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/LineColumn.java
rename to src/main/org/codehaus/groovy/antlr/LineColumn.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/Main.java b/src/main/org/codehaus/groovy/antlr/Main.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/Main.java
rename to src/main/org/codehaus/groovy/antlr/Main.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/SourceBuffer.java b/src/main/org/codehaus/groovy/antlr/SourceBuffer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/SourceBuffer.java
rename to src/main/org/codehaus/groovy/antlr/SourceBuffer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/SourceInfo.java b/src/main/org/codehaus/groovy/antlr/SourceInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/SourceInfo.java
rename to src/main/org/codehaus/groovy/antlr/SourceInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java b/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java
rename to src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/UnicodeLexerSharedInputState.java b/src/main/org/codehaus/groovy/antlr/UnicodeLexerSharedInputState.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/UnicodeLexerSharedInputState.java
rename to src/main/org/codehaus/groovy/antlr/UnicodeLexerSharedInputState.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/groovy.g b/src/main/org/codehaus/groovy/antlr/groovy.g
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/groovy.g
rename to src/main/org/codehaus/groovy/antlr/groovy.g
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Groovifier.java b/src/main/org/codehaus/groovy/antlr/java/Groovifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Groovifier.java
rename to src/main/org/codehaus/groovy/antlr/java/Groovifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Java2GroovyConverter.java b/src/main/org/codehaus/groovy/antlr/java/Java2GroovyConverter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Java2GroovyConverter.java
rename to src/main/org/codehaus/groovy/antlr/java/Java2GroovyConverter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java b/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java
rename to src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Java2GroovyProcessor.java b/src/main/org/codehaus/groovy/antlr/java/Java2GroovyProcessor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/Java2GroovyProcessor.java
rename to src/main/org/codehaus/groovy/antlr/java/Java2GroovyProcessor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java b/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java
rename to src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/java.g b/src/main/org/codehaus/groovy/antlr/java/java.g
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/java/java.g
rename to src/main/org/codehaus/groovy/antlr/java/java.g
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/package.html b/src/main/org/codehaus/groovy/antlr/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/package.html
rename to src/main/org/codehaus/groovy/antlr/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java b/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java b/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/MindMapPrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/MindMapPrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/MindMapPrinter.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/MindMapPrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java b/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/PreOrderTraversal.java b/src/main/org/codehaus/groovy/antlr/treewalker/PreOrderTraversal.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/PreOrderTraversal.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/PreOrderTraversal.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java b/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java b/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/Visitor.java b/src/main/org/codehaus/groovy/antlr/treewalker/Visitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/Visitor.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/Visitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/VisitorAdapter.java b/src/main/org/codehaus/groovy/antlr/treewalker/VisitorAdapter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/VisitorAdapter.java
rename to src/main/org/codehaus/groovy/antlr/treewalker/VisitorAdapter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/package.html b/src/main/org/codehaus/groovy/antlr/treewalker/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/antlr/treewalker/package.html
rename to src/main/org/codehaus/groovy/antlr/treewalker/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ASTNode.java b/src/main/org/codehaus/groovy/ast/ASTNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ASTNode.java
rename to src/main/org/codehaus/groovy/ast/ASTNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/AnnotatedNode.java b/src/main/org/codehaus/groovy/ast/AnnotatedNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/AnnotatedNode.java
rename to src/main/org/codehaus/groovy/ast/AnnotatedNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/AnnotationNode.java b/src/main/org/codehaus/groovy/ast/AnnotationNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/AnnotationNode.java
rename to src/main/org/codehaus/groovy/ast/AnnotationNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/AstToTextHelper.java b/src/main/org/codehaus/groovy/ast/AstToTextHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/AstToTextHelper.java
rename to src/main/org/codehaus/groovy/ast/AstToTextHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java b/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java
rename to src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java b/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java
rename to src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassHelper.java b/src/main/org/codehaus/groovy/ast/ClassHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassHelper.java
rename to src/main/org/codehaus/groovy/ast/ClassHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassNode.java b/src/main/org/codehaus/groovy/ast/ClassNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ClassNode.java
rename to src/main/org/codehaus/groovy/ast/ClassNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java b/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java
rename to src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/CompileUnit.java b/src/main/org/codehaus/groovy/ast/CompileUnit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/CompileUnit.java
rename to src/main/org/codehaus/groovy/ast/CompileUnit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ConstructorNode.java b/src/main/org/codehaus/groovy/ast/ConstructorNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ConstructorNode.java
rename to src/main/org/codehaus/groovy/ast/ConstructorNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/DynamicVariable.java b/src/main/org/codehaus/groovy/ast/DynamicVariable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/DynamicVariable.java
rename to src/main/org/codehaus/groovy/ast/DynamicVariable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/EnumConstantClassNode.java b/src/main/org/codehaus/groovy/ast/EnumConstantClassNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/EnumConstantClassNode.java
rename to src/main/org/codehaus/groovy/ast/EnumConstantClassNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/FieldNode.java b/src/main/org/codehaus/groovy/ast/FieldNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/FieldNode.java
rename to src/main/org/codehaus/groovy/ast/FieldNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/GenericsType.java b/src/main/org/codehaus/groovy/ast/GenericsType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/GenericsType.java
rename to src/main/org/codehaus/groovy/ast/GenericsType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/GroovyClassVisitor.java b/src/main/org/codehaus/groovy/ast/GroovyClassVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/GroovyClassVisitor.java
rename to src/main/org/codehaus/groovy/ast/GroovyClassVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java b/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java
rename to src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ImportNode.java b/src/main/org/codehaus/groovy/ast/ImportNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ImportNode.java
rename to src/main/org/codehaus/groovy/ast/ImportNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/InnerClassNode.java b/src/main/org/codehaus/groovy/ast/InnerClassNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/InnerClassNode.java
rename to src/main/org/codehaus/groovy/ast/InnerClassNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/InterfaceHelperClassNode.java b/src/main/org/codehaus/groovy/ast/InterfaceHelperClassNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/InterfaceHelperClassNode.java
rename to src/main/org/codehaus/groovy/ast/InterfaceHelperClassNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/MethodNode.java b/src/main/org/codehaus/groovy/ast/MethodNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/MethodNode.java
rename to src/main/org/codehaus/groovy/ast/MethodNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java b/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java
rename to src/main/org/codehaus/groovy/ast/MixinASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/MixinNode.java b/src/main/org/codehaus/groovy/ast/MixinNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/MixinNode.java
rename to src/main/org/codehaus/groovy/ast/MixinNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ModuleNode.java b/src/main/org/codehaus/groovy/ast/ModuleNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/ModuleNode.java
rename to src/main/org/codehaus/groovy/ast/ModuleNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/PackageNode.java b/src/main/org/codehaus/groovy/ast/PackageNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/PackageNode.java
rename to src/main/org/codehaus/groovy/ast/PackageNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/Parameter.java b/src/main/org/codehaus/groovy/ast/Parameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/Parameter.java
rename to src/main/org/codehaus/groovy/ast/Parameter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/PropertyNode.java b/src/main/org/codehaus/groovy/ast/PropertyNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/PropertyNode.java
rename to src/main/org/codehaus/groovy/ast/PropertyNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/Variable.java b/src/main/org/codehaus/groovy/ast/Variable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/Variable.java
rename to src/main/org/codehaus/groovy/ast/Variable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/VariableScope.java b/src/main/org/codehaus/groovy/ast/VariableScope.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/VariableScope.java
rename to src/main/org/codehaus/groovy/ast/VariableScope.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy b/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy
rename to src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java b/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java
rename to src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy b/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy
rename to src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy b/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
rename to src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java b/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java b/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java b/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/AttributeExpression.java b/src/main/org/codehaus/groovy/ast/expr/AttributeExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/AttributeExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/AttributeExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/BinaryExpression.java b/src/main/org/codehaus/groovy/ast/expr/BinaryExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/BinaryExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/BinaryExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/BitwiseNegationExpression.java b/src/main/org/codehaus/groovy/ast/expr/BitwiseNegationExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/BitwiseNegationExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/BitwiseNegationExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/BooleanExpression.java b/src/main/org/codehaus/groovy/ast/expr/BooleanExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/BooleanExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/BooleanExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/CastExpression.java b/src/main/org/codehaus/groovy/ast/expr/CastExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/CastExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/CastExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ClassExpression.java b/src/main/org/codehaus/groovy/ast/expr/ClassExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ClassExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ClassExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java b/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java b/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ConstantExpression.java b/src/main/org/codehaus/groovy/ast/expr/ConstantExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ConstantExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ConstantExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java b/src/main/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ConstructorCallExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/DeclarationExpression.java b/src/main/org/codehaus/groovy/ast/expr/DeclarationExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/DeclarationExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/DeclarationExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java b/src/main/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ElvisOperatorExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/EmptyExpression.java b/src/main/org/codehaus/groovy/ast/expr/EmptyExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/EmptyExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/EmptyExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/Expression.java b/src/main/org/codehaus/groovy/ast/expr/Expression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/Expression.java
rename to src/main/org/codehaus/groovy/ast/expr/Expression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ExpressionTransformer.java b/src/main/org/codehaus/groovy/ast/expr/ExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ExpressionTransformer.java
rename to src/main/org/codehaus/groovy/ast/expr/ExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/FieldExpression.java b/src/main/org/codehaus/groovy/ast/expr/FieldExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/FieldExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/FieldExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java b/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/GStringExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ListExpression.java b/src/main/org/codehaus/groovy/ast/expr/ListExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/ListExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/ListExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MapEntryExpression.java b/src/main/org/codehaus/groovy/ast/expr/MapEntryExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MapEntryExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/MapEntryExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MapExpression.java b/src/main/org/codehaus/groovy/ast/expr/MapExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MapExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/MapExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MethodCall.java b/src/main/org/codehaus/groovy/ast/expr/MethodCall.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MethodCall.java
rename to src/main/org/codehaus/groovy/ast/expr/MethodCall.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java b/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java b/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java b/src/main/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/NamedArgumentListExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/NotExpression.java b/src/main/org/codehaus/groovy/ast/expr/NotExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/NotExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/NotExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/PostfixExpression.java b/src/main/org/codehaus/groovy/ast/expr/PostfixExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/PostfixExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/PostfixExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/PrefixExpression.java b/src/main/org/codehaus/groovy/ast/expr/PrefixExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/PrefixExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/PrefixExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/PropertyExpression.java b/src/main/org/codehaus/groovy/ast/expr/PropertyExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/PropertyExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/PropertyExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/RangeExpression.java b/src/main/org/codehaus/groovy/ast/expr/RangeExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/RangeExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/RangeExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/SpreadExpression.java b/src/main/org/codehaus/groovy/ast/expr/SpreadExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/SpreadExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/SpreadExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/SpreadMapExpression.java b/src/main/org/codehaus/groovy/ast/expr/SpreadMapExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/SpreadMapExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/SpreadMapExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java b/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/TernaryExpression.java b/src/main/org/codehaus/groovy/ast/expr/TernaryExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/TernaryExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/TernaryExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java b/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/TupleExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/UnaryMinusExpression.java b/src/main/org/codehaus/groovy/ast/expr/UnaryMinusExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/UnaryMinusExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/UnaryMinusExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/UnaryPlusExpression.java b/src/main/org/codehaus/groovy/ast/expr/UnaryPlusExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/UnaryPlusExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/UnaryPlusExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/VariableExpression.java b/src/main/org/codehaus/groovy/ast/expr/VariableExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/VariableExpression.java
rename to src/main/org/codehaus/groovy/ast/expr/VariableExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/package.html b/src/main/org/codehaus/groovy/ast/expr/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/expr/package.html
rename to src/main/org/codehaus/groovy/ast/expr/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/package.html b/src/main/org/codehaus/groovy/ast/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/package.html
rename to src/main/org/codehaus/groovy/ast/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/AssertStatement.java b/src/main/org/codehaus/groovy/ast/stmt/AssertStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/AssertStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/AssertStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java b/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/BreakStatement.java b/src/main/org/codehaus/groovy/ast/stmt/BreakStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/BreakStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/BreakStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/CaseStatement.java b/src/main/org/codehaus/groovy/ast/stmt/CaseStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/CaseStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/CaseStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/CatchStatement.java b/src/main/org/codehaus/groovy/ast/stmt/CatchStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/CatchStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/CatchStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ContinueStatement.java b/src/main/org/codehaus/groovy/ast/stmt/ContinueStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ContinueStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/ContinueStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/DoWhileStatement.java b/src/main/org/codehaus/groovy/ast/stmt/DoWhileStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/DoWhileStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/DoWhileStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/EmptyStatement.java b/src/main/org/codehaus/groovy/ast/stmt/EmptyStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/EmptyStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/EmptyStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ExpressionStatement.java b/src/main/org/codehaus/groovy/ast/stmt/ExpressionStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ExpressionStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/ExpressionStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ForStatement.java b/src/main/org/codehaus/groovy/ast/stmt/ForStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ForStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/ForStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/IfStatement.java b/src/main/org/codehaus/groovy/ast/stmt/IfStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/IfStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/IfStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/LoopingStatement.java b/src/main/org/codehaus/groovy/ast/stmt/LoopingStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/LoopingStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/LoopingStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ReturnStatement.java b/src/main/org/codehaus/groovy/ast/stmt/ReturnStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ReturnStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/ReturnStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/Statement.java b/src/main/org/codehaus/groovy/ast/stmt/Statement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/Statement.java
rename to src/main/org/codehaus/groovy/ast/stmt/Statement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java b/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java b/src/main/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/SynchronizedStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ThrowStatement.java b/src/main/org/codehaus/groovy/ast/stmt/ThrowStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/ThrowStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/ThrowStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java b/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/WhileStatement.java b/src/main/org/codehaus/groovy/ast/stmt/WhileStatement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/WhileStatement.java
rename to src/main/org/codehaus/groovy/ast/stmt/WhileStatement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/package.html b/src/main/org/codehaus/groovy/ast/stmt/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/stmt/package.html
rename to src/main/org/codehaus/groovy/ast/stmt/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/ClosureUtils.java b/src/main/org/codehaus/groovy/ast/tools/ClosureUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/ClosureUtils.java
rename to src/main/org/codehaus/groovy/ast/tools/ClosureUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java b/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
rename to src/main/org/codehaus/groovy/ast/tools/GeneralUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java
rename to src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java b/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java
rename to src/main/org/codehaus/groovy/ast/tools/WideningCategories.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java b/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java
rename to src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
rename to src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/BytecodeExpression.java b/src/main/org/codehaus/groovy/classgen/BytecodeExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/BytecodeExpression.java
rename to src/main/org/codehaus/groovy/classgen/BytecodeExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/BytecodeInstruction.java b/src/main/org/codehaus/groovy/classgen/BytecodeInstruction.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/BytecodeInstruction.java
rename to src/main/org/codehaus/groovy/classgen/BytecodeInstruction.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/BytecodeSequence.java b/src/main/org/codehaus/groovy/classgen/BytecodeSequence.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/BytecodeSequence.java
rename to src/main/org/codehaus/groovy/classgen/BytecodeSequence.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java b/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
rename to src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ClassGenerator.java b/src/main/org/codehaus/groovy/classgen/ClassGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ClassGenerator.java
rename to src/main/org/codehaus/groovy/classgen/ClassGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java b/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java
rename to src/main/org/codehaus/groovy/classgen/ClassGeneratorException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java b/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java
rename to src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java b/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java
rename to src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/EnumVisitor.java b/src/main/org/codehaus/groovy/classgen/EnumVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/EnumVisitor.java
rename to src/main/org/codehaus/groovy/classgen/EnumVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java b/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java
rename to src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/GeneratorContext.java b/src/main/org/codehaus/groovy/classgen/GeneratorContext.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/GeneratorContext.java
rename to src/main/org/codehaus/groovy/classgen/GeneratorContext.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java b/src/main/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java
rename to src/main/org/codehaus/groovy/classgen/InnerClassCompletionVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/InnerClassVisitor.java b/src/main/org/codehaus/groovy/classgen/InnerClassVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/InnerClassVisitor.java
rename to src/main/org/codehaus/groovy/classgen/InnerClassVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java b/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java
rename to src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/org/codehaus/groovy/classgen/ReturnAdder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/ReturnAdder.java
rename to src/main/org/codehaus/groovy/classgen/ReturnAdder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java b/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java
rename to src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/Verifier.java b/src/main/org/codehaus/groovy/classgen/Verifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/Verifier.java
rename to src/main/org/codehaus/groovy/classgen/Verifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java b/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java
rename to src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java b/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryBooleanExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BinaryObjectExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BytecodeDumper.java b/src/main/org/codehaus/groovy/classgen/asm/BytecodeDumper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BytecodeDumper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BytecodeDumper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BytecodeVariable.java b/src/main/org/codehaus/groovy/classgen/asm/BytecodeVariable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/BytecodeVariable.java
rename to src/main/org/codehaus/groovy/classgen/asm/BytecodeVariable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java b/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java b/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/CompileStack.java
rename to src/main/org/codehaus/groovy/classgen/asm/CompileStack.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/DelegatingController.java b/src/main/org/codehaus/groovy/classgen/asm/DelegatingController.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/DelegatingController.java
rename to src/main/org/codehaus/groovy/classgen/asm/DelegatingController.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java b/src/main/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java
rename to src/main/org/codehaus/groovy/classgen/asm/ExpressionAsVariableSlot.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java b/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java
rename to src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java b/src/main/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java
rename to src/main/org/codehaus/groovy/classgen/asm/MethodCallerMultiAdapter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java b/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/MopWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java b/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java
rename to src/main/org/codehaus/groovy/classgen/asm/OperandStack.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/StatementMetaTypeChooser.java b/src/main/org/codehaus/groovy/classgen/asm/StatementMetaTypeChooser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/StatementMetaTypeChooser.java
rename to src/main/org/codehaus/groovy/classgen/asm/StatementMetaTypeChooser.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/StatementWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/TypeChooser.java b/src/main/org/codehaus/groovy/classgen/asm/TypeChooser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/TypeChooser.java
rename to src/main/org/codehaus/groovy/classgen/asm/TypeChooser.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java b/src/main/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java
rename to src/main/org/codehaus/groovy/classgen/asm/VariableSlotLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/WriterController.java b/src/main/org/codehaus/groovy/classgen/asm/WriterController.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/WriterController.java
rename to src/main/org/codehaus/groovy/classgen/asm/WriterController.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/WriterControllerFactory.java b/src/main/org/codehaus/groovy/classgen/asm/WriterControllerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/WriterControllerFactory.java
rename to src/main/org/codehaus/groovy/classgen/asm/WriterControllerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/indy/IndyBinHelper.java b/src/main/org/codehaus/groovy/classgen/asm/indy/IndyBinHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/indy/IndyBinHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/indy/IndyBinHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java b/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/package.html b/src/main/org/codehaus/groovy/classgen/asm/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/package.html
rename to src/main/org/codehaus/groovy/classgen/asm/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticCompilationMopWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticCompilationMopWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticCompilationMopWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticCompilationMopWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticPropertyAccessHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesClosureWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesStatementWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesTypeChooser.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesTypeChooser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesTypeChooser.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesTypeChooser.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterController.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterControllerFactoryImpl.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterControllerFactoryImpl.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterControllerFactoryImpl.java
rename to src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesWriterControllerFactoryImpl.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genArrayAccess.groovy b/src/main/org/codehaus/groovy/classgen/genArrayAccess.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genArrayAccess.groovy
rename to src/main/org/codehaus/groovy/classgen/genArrayAccess.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genArrays.groovy b/src/main/org/codehaus/groovy/classgen/genArrays.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genArrays.groovy
rename to src/main/org/codehaus/groovy/classgen/genArrays.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genDgmMath.groovy b/src/main/org/codehaus/groovy/classgen/genDgmMath.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genDgmMath.groovy
rename to src/main/org/codehaus/groovy/classgen/genDgmMath.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genMathModification.groovy b/src/main/org/codehaus/groovy/classgen/genMathModification.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/genMathModification.groovy
rename to src/main/org/codehaus/groovy/classgen/genMathModification.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/package.html b/src/main/org/codehaus/groovy/classgen/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/classgen/package.html
rename to src/main/org/codehaus/groovy/classgen/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/cli/GroovyPosixParser.java b/src/main/org/codehaus/groovy/cli/GroovyPosixParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/cli/GroovyPosixParser.java
rename to src/main/org/codehaus/groovy/cli/GroovyPosixParser.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java b/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ASTTransformationsContext.java
rename to src/main/org/codehaus/groovy/control/ASTTransformationsContext.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/AnnotationConstantsVisitor.java b/src/main/org/codehaus/groovy/control/AnnotationConstantsVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/AnnotationConstantsVisitor.java
rename to src/main/org/codehaus/groovy/control/AnnotationConstantsVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/BytecodeProcessor.java b/src/main/org/codehaus/groovy/control/BytecodeProcessor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/BytecodeProcessor.java
rename to src/main/org/codehaus/groovy/control/BytecodeProcessor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ClassNodeResolver.java b/src/main/org/codehaus/groovy/control/ClassNodeResolver.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ClassNodeResolver.java
rename to src/main/org/codehaus/groovy/control/ClassNodeResolver.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilationFailedException.java b/src/main/org/codehaus/groovy/control/CompilationFailedException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilationFailedException.java
rename to src/main/org/codehaus/groovy/control/CompilationFailedException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilationUnit.java b/src/main/org/codehaus/groovy/control/CompilationUnit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilationUnit.java
rename to src/main/org/codehaus/groovy/control/CompilationUnit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilePhase.java b/src/main/org/codehaus/groovy/control/CompilePhase.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilePhase.java
rename to src/main/org/codehaus/groovy/control/CompilePhase.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
rename to src/main/org/codehaus/groovy/control/CompilerConfiguration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ConfigurationException.java b/src/main/org/codehaus/groovy/control/ConfigurationException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ConfigurationException.java
rename to src/main/org/codehaus/groovy/control/ConfigurationException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ErrorCollector.java b/src/main/org/codehaus/groovy/control/ErrorCollector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ErrorCollector.java
rename to src/main/org/codehaus/groovy/control/ErrorCollector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/GenericsVisitor.java b/src/main/org/codehaus/groovy/control/GenericsVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/GenericsVisitor.java
rename to src/main/org/codehaus/groovy/control/GenericsVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/HasCleanup.java b/src/main/org/codehaus/groovy/control/HasCleanup.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/HasCleanup.java
rename to src/main/org/codehaus/groovy/control/HasCleanup.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/Janitor.java b/src/main/org/codehaus/groovy/control/Janitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/Janitor.java
rename to src/main/org/codehaus/groovy/control/Janitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/LabelVerifier.java b/src/main/org/codehaus/groovy/control/LabelVerifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/LabelVerifier.java
rename to src/main/org/codehaus/groovy/control/LabelVerifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java b/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
rename to src/main/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/OptimizerVisitor.java b/src/main/org/codehaus/groovy/control/OptimizerVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/OptimizerVisitor.java
rename to src/main/org/codehaus/groovy/control/OptimizerVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ParserPlugin.java b/src/main/org/codehaus/groovy/control/ParserPlugin.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ParserPlugin.java
rename to src/main/org/codehaus/groovy/control/ParserPlugin.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ParserPluginFactory.java b/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ParserPluginFactory.java
rename to src/main/org/codehaus/groovy/control/ParserPluginFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/Phases.java b/src/main/org/codehaus/groovy/control/Phases.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/Phases.java
rename to src/main/org/codehaus/groovy/control/Phases.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ProcessingUnit.java b/src/main/org/codehaus/groovy/control/ProcessingUnit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ProcessingUnit.java
rename to src/main/org/codehaus/groovy/control/ProcessingUnit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/org/codehaus/groovy/control/ResolveVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/ResolveVisitor.java
rename to src/main/org/codehaus/groovy/control/ResolveVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/SourceExtensionHandler.java b/src/main/org/codehaus/groovy/control/SourceExtensionHandler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/SourceExtensionHandler.java
rename to src/main/org/codehaus/groovy/control/SourceExtensionHandler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/SourceUnit.java b/src/main/org/codehaus/groovy/control/SourceUnit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/SourceUnit.java
rename to src/main/org/codehaus/groovy/control/SourceUnit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/StaticImportVisitor.java b/src/main/org/codehaus/groovy/control/StaticImportVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/StaticImportVisitor.java
rename to src/main/org/codehaus/groovy/control/StaticImportVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/StaticVerifier.java b/src/main/org/codehaus/groovy/control/StaticVerifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/StaticVerifier.java
rename to src/main/org/codehaus/groovy/control/StaticVerifier.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy b/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy
rename to src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/CompilationCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/CompilationCustomizer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/CompilationCustomizer.java
rename to src/main/org/codehaus/groovy/control/customizers/CompilationCustomizer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/DelegatingCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/DelegatingCustomizer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/DelegatingCustomizer.java
rename to src/main/org/codehaus/groovy/control/customizers/DelegatingCustomizer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java
rename to src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
rename to src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/SourceAwareCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/SourceAwareCustomizer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/SourceAwareCustomizer.java
rename to src/main/org/codehaus/groovy/control/customizers/SourceAwareCustomizer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy b/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy
rename to src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilder.groovy b/src/main/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilder.groovy
rename to src/main/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/CustomizersFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/CustomizersFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/CustomizersFactory.java
rename to src/main/org/codehaus/groovy/control/customizers/builder/CustomizersFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java
rename to src/main/org/codehaus/groovy/control/customizers/builder/ImportCustomizerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/InlinedASTCustomizerFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/InlinedASTCustomizerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/InlinedASTCustomizerFactory.java
rename to src/main/org/codehaus/groovy/control/customizers/builder/InlinedASTCustomizerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/PostCompletionFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/PostCompletionFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/PostCompletionFactory.java
rename to src/main/org/codehaus/groovy/control/customizers/builder/PostCompletionFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/SecureASTCustomizerFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/SecureASTCustomizerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/SecureASTCustomizerFactory.java
rename to src/main/org/codehaus/groovy/control/customizers/builder/SecureASTCustomizerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java b/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java
rename to src/main/org/codehaus/groovy/control/customizers/builder/SourceAwareCustomizerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java b/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
rename to src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/FileReaderSource.java b/src/main/org/codehaus/groovy/control/io/FileReaderSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/FileReaderSource.java
rename to src/main/org/codehaus/groovy/control/io/FileReaderSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java b/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
rename to src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/NullWriter.java b/src/main/org/codehaus/groovy/control/io/NullWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/NullWriter.java
rename to src/main/org/codehaus/groovy/control/io/NullWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/ReaderSource.java b/src/main/org/codehaus/groovy/control/io/ReaderSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/ReaderSource.java
rename to src/main/org/codehaus/groovy/control/io/ReaderSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/StringReaderSource.java b/src/main/org/codehaus/groovy/control/io/StringReaderSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/StringReaderSource.java
rename to src/main/org/codehaus/groovy/control/io/StringReaderSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/URLReaderSource.java b/src/main/org/codehaus/groovy/control/io/URLReaderSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/URLReaderSource.java
rename to src/main/org/codehaus/groovy/control/io/URLReaderSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/package.html b/src/main/org/codehaus/groovy/control/io/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/io/package.html
rename to src/main/org/codehaus/groovy/control/io/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java b/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
rename to src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java b/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
rename to src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/Message.java b/src/main/org/codehaus/groovy/control/messages/Message.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/Message.java
rename to src/main/org/codehaus/groovy/control/messages/Message.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java b/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
rename to src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java b/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
rename to src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/WarningMessage.java b/src/main/org/codehaus/groovy/control/messages/WarningMessage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/WarningMessage.java
rename to src/main/org/codehaus/groovy/control/messages/WarningMessage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/package.html b/src/main/org/codehaus/groovy/control/messages/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/messages/package.html
rename to src/main/org/codehaus/groovy/control/messages/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/package.html b/src/main/org/codehaus/groovy/control/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/control/package.html
rename to src/main/org/codehaus/groovy/control/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/package.html b/src/main/org/codehaus/groovy/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/package.html
rename to src/main/org/codehaus/groovy/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/plugin/GroovyRunner.java b/src/main/org/codehaus/groovy/plugin/GroovyRunner.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/plugin/GroovyRunner.java
rename to src/main/org/codehaus/groovy/plugin/GroovyRunner.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedClass.java b/src/main/org/codehaus/groovy/reflection/CachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedClass.java
rename to src/main/org/codehaus/groovy/reflection/CachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedConstructor.java b/src/main/org/codehaus/groovy/reflection/CachedConstructor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedConstructor.java
rename to src/main/org/codehaus/groovy/reflection/CachedConstructor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedField.java b/src/main/org/codehaus/groovy/reflection/CachedField.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedField.java
rename to src/main/org/codehaus/groovy/reflection/CachedField.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/org/codehaus/groovy/reflection/CachedMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/CachedMethod.java
rename to src/main/org/codehaus/groovy/reflection/CachedMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ClassInfo.java b/src/main/org/codehaus/groovy/reflection/ClassInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ClassInfo.java
rename to src/main/org/codehaus/groovy/reflection/ClassInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java b/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java
rename to src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java b/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
rename to src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java b/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GroovyClassValue.java
rename to src/main/org/codehaus/groovy/reflection/GroovyClassValue.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java b/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java
rename to src/main/org/codehaus/groovy/reflection/GroovyClassValueFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java b/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java
rename to src/main/org/codehaus/groovy/reflection/GroovyClassValuePreJava7.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/MixinInMetaClass.java b/src/main/org/codehaus/groovy/reflection/MixinInMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/MixinInMetaClass.java
rename to src/main/org/codehaus/groovy/reflection/MixinInMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ParameterTypes.java b/src/main/org/codehaus/groovy/reflection/ParameterTypes.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ParameterTypes.java
rename to src/main/org/codehaus/groovy/reflection/ParameterTypes.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ReflectionCache.java b/src/main/org/codehaus/groovy/reflection/ReflectionCache.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ReflectionCache.java
rename to src/main/org/codehaus/groovy/reflection/ReflectionCache.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java b/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java
rename to src/main/org/codehaus/groovy/reflection/ReflectionUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/SunClassLoader.java b/src/main/org/codehaus/groovy/reflection/SunClassLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/SunClassLoader.java
rename to src/main/org/codehaus/groovy/reflection/SunClassLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/android/AndroidSupport.java b/src/main/org/codehaus/groovy/reflection/android/AndroidSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/android/AndroidSupport.java
rename to src/main/org/codehaus/groovy/reflection/android/AndroidSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/package.html b/src/main/org/codehaus/groovy/reflection/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/package.html
rename to src/main/org/codehaus/groovy/reflection/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ArrayCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/ArrayCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ArrayCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/ArrayCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/BigIntegerCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/BigIntegerCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/BigIntegerCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/BigIntegerCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/BooleanCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ByteCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/ByteCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ByteCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/ByteCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/CharacterCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/CharacterCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/CharacterCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/CharacterCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/DoubleCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/DoubleCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/DoubleCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/DoubleCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/FloatCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/FloatCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/FloatCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/FloatCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/IntegerCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/IntegerCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/IntegerCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/IntegerCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/LongCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/NumberCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ObjectCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/ObjectCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ObjectCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/ObjectCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ShortCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/ShortCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/ShortCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/ShortCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/StringCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/StringCachedClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/stdclasses/StringCachedClass.java
rename to src/main/org/codehaus/groovy/reflection/stdclasses/StringCachedClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/v7/GroovyClassValueJava7.java b/src/main/org/codehaus/groovy/reflection/v7/GroovyClassValueJava7.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/reflection/v7/GroovyClassValueJava7.java
rename to src/main/org/codehaus/groovy/reflection/v7/GroovyClassValueJava7.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/AbstractComparator.java b/src/main/org/codehaus/groovy/runtime/AbstractComparator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/AbstractComparator.java
rename to src/main/org/codehaus/groovy/runtime/AbstractComparator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ArrayUtil.java b/src/main/org/codehaus/groovy/runtime/ArrayUtil.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ArrayUtil.java
rename to src/main/org/codehaus/groovy/runtime/ArrayUtil.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/BytecodeInterface8.java b/src/main/org/codehaus/groovy/runtime/BytecodeInterface8.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/BytecodeInterface8.java
rename to src/main/org/codehaus/groovy/runtime/BytecodeInterface8.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ClassExtender.java b/src/main/org/codehaus/groovy/runtime/ClassExtender.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ClassExtender.java
rename to src/main/org/codehaus/groovy/runtime/ClassExtender.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ComposedClosure.java b/src/main/org/codehaus/groovy/runtime/ComposedClosure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ComposedClosure.java
rename to src/main/org/codehaus/groovy/runtime/ComposedClosure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ConversionHandler.java b/src/main/org/codehaus/groovy/runtime/ConversionHandler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ConversionHandler.java
rename to src/main/org/codehaus/groovy/runtime/ConversionHandler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ConvertedClosure.java b/src/main/org/codehaus/groovy/runtime/ConvertedClosure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ConvertedClosure.java
rename to src/main/org/codehaus/groovy/runtime/ConvertedClosure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ConvertedMap.java b/src/main/org/codehaus/groovy/runtime/ConvertedMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ConvertedMap.java
rename to src/main/org/codehaus/groovy/runtime/ConvertedMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/CurriedClosure.java b/src/main/org/codehaus/groovy/runtime/CurriedClosure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/CurriedClosure.java
rename to src/main/org/codehaus/groovy/runtime/CurriedClosure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DateGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DateGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DateGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/DateGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultCachedMethodKey.java b/src/main/org/codehaus/groovy/runtime/DefaultCachedMethodKey.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultCachedMethodKey.java
rename to src/main/org/codehaus/groovy/runtime/DefaultCachedMethodKey.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java
rename to src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
rename to src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultMethodKey.java b/src/main/org/codehaus/groovy/runtime/DefaultMethodKey.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/DefaultMethodKey.java
rename to src/main/org/codehaus/groovy/runtime/DefaultMethodKey.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java b/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java
rename to src/main/org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java b/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java
rename to src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/GStringImpl.java b/src/main/org/codehaus/groovy/runtime/GStringImpl.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/GStringImpl.java
rename to src/main/org/codehaus/groovy/runtime/GStringImpl.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/GeneratedClosure.java b/src/main/org/codehaus/groovy/runtime/GeneratedClosure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/GeneratedClosure.java
rename to src/main/org/codehaus/groovy/runtime/GeneratedClosure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java b/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java
rename to src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java b/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java
rename to src/main/org/codehaus/groovy/runtime/HandleMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/IOGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/InvokerHelper.java b/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/InvokerHelper.java
rename to src/main/org/codehaus/groovy/runtime/InvokerHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java b/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java
rename to src/main/org/codehaus/groovy/runtime/InvokerInvocationException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java b/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java
rename to src/main/org/codehaus/groovy/runtime/IteratorClosureAdapter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java b/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java
rename to src/main/org/codehaus/groovy/runtime/MetaClassHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MethodClosure.java b/src/main/org/codehaus/groovy/runtime/MethodClosure.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MethodClosure.java
rename to src/main/org/codehaus/groovy/runtime/MethodClosure.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MethodKey.java b/src/main/org/codehaus/groovy/runtime/MethodKey.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MethodKey.java
rename to src/main/org/codehaus/groovy/runtime/MethodKey.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java b/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java
rename to src/main/org/codehaus/groovy/runtime/MethodRankHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/NullObject.java b/src/main/org/codehaus/groovy/runtime/NullObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/NullObject.java
rename to src/main/org/codehaus/groovy/runtime/NullObject.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java b/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
rename to src/main/org/codehaus/groovy/runtime/NumberAwareComparator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ProcessGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/ProcessGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ProcessGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/ProcessGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
rename to src/main/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/RangeInfo.java b/src/main/org/codehaus/groovy/runtime/RangeInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/RangeInfo.java
rename to src/main/org/codehaus/groovy/runtime/RangeInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ReflectionMethodInvoker.java b/src/main/org/codehaus/groovy/runtime/ReflectionMethodInvoker.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ReflectionMethodInvoker.java
rename to src/main/org/codehaus/groovy/runtime/ReflectionMethodInvoker.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/Reflector.java b/src/main/org/codehaus/groovy/runtime/Reflector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/Reflector.java
rename to src/main/org/codehaus/groovy/runtime/Reflector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/RegexSupport.java b/src/main/org/codehaus/groovy/runtime/RegexSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/RegexSupport.java
rename to src/main/org/codehaus/groovy/runtime/RegexSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ReverseListIterator.java b/src/main/org/codehaus/groovy/runtime/ReverseListIterator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ReverseListIterator.java
rename to src/main/org/codehaus/groovy/runtime/ReverseListIterator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java b/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
rename to src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ScriptReference.java b/src/main/org/codehaus/groovy/runtime/ScriptReference.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/ScriptReference.java
rename to src/main/org/codehaus/groovy/runtime/ScriptReference.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/SocketGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java b/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java
rename to src/main/org/codehaus/groovy/runtime/StackTraceUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/StringBufferWriter.java b/src/main/org/codehaus/groovy/runtime/StringBufferWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/StringBufferWriter.java
rename to src/main/org/codehaus/groovy/runtime/StringBufferWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java
rename to src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/WritableFile.java b/src/main/org/codehaus/groovy/runtime/WritableFile.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/WritableFile.java
rename to src/main/org/codehaus/groovy/runtime/WritableFile.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java b/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java
rename to src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java b/src/main/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java
rename to src/main/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/CallSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java
rename to src/main/org/codehaus/groovy/runtime/callsite/CallSiteArray.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java
rename to src/main/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java b/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java
rename to src/main/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java b/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ConstructorSite.java b/src/main/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/DummyCallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/DummyCallSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/DummyCallSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/DummyCallSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java b/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java
rename to src/main/org/codehaus/groovy/runtime/callsite/GroovySunClassLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java b/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/MetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/MetaClassSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/MetaClassSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/MetaClassSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java b/src/main/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/NullCallSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java b/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java b/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java b/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java b/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
rename to src/main/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java b/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModule.java b/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
rename to src/main/org/codehaus/groovy/runtime/m12n/ExtensionModule.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleRegistry.java b/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleRegistry.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleRegistry.java
rename to src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleRegistry.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java b/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java
rename to src/main/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java b/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
rename to src/main/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/PropertiesModuleFactory.java b/src/main/org/codehaus/groovy/runtime/m12n/PropertiesModuleFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/PropertiesModuleFactory.java
rename to src/main/org/codehaus/groovy/runtime/m12n/PropertiesModuleFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/SimpleExtensionModule.java b/src/main/org/codehaus/groovy/runtime/m12n/SimpleExtensionModule.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/SimpleExtensionModule.java
rename to src/main/org/codehaus/groovy/runtime/m12n/SimpleExtensionModule.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/StandardPropertiesModuleFactory.java b/src/main/org/codehaus/groovy/runtime/m12n/StandardPropertiesModuleFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/m12n/StandardPropertiesModuleFactory.java
rename to src/main/org/codehaus/groovy/runtime/m12n/StandardPropertiesModuleFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/LRUCache.java b/src/main/org/codehaus/groovy/runtime/memoize/LRUCache.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/LRUCache.java
rename to src/main/org/codehaus/groovy/runtime/memoize/LRUCache.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java b/src/main/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java
rename to src/main/org/codehaus/groovy/runtime/memoize/LRUProtectionStorage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java b/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/Memoize.java
rename to src/main/org/codehaus/groovy/runtime/memoize/Memoize.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/MemoizeCache.java b/src/main/org/codehaus/groovy/runtime/memoize/MemoizeCache.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/MemoizeCache.java
rename to src/main/org/codehaus/groovy/runtime/memoize/MemoizeCache.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/NullProtectionStorage.java b/src/main/org/codehaus/groovy/runtime/memoize/NullProtectionStorage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/NullProtectionStorage.java
rename to src/main/org/codehaus/groovy/runtime/memoize/NullProtectionStorage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/ProtectionStorage.java b/src/main/org/codehaus/groovy/runtime/memoize/ProtectionStorage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/ProtectionStorage.java
rename to src/main/org/codehaus/groovy/runtime/memoize/ProtectionStorage.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java b/src/main/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
rename to src/main/org/codehaus/groovy/runtime/memoize/UnlimitedConcurrentCache.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java b/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ClosureMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ClosureStaticMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java b/src/main/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/DefaultMetaClassInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java b/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MethodHelper.java b/src/main/org/codehaus/groovy/runtime/metaclass/MethodHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MethodHelper.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MethodHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java b/src/main/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MethodMetaProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java b/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MethodSelectionException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java b/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExceptionNoStack.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java b/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MissingMethodExecutionFailed.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java b/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MissingPropertyExceptionNoStack.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java b/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MixedInMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java b/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MixinInstanceMetaProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java b/src/main/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/MultipleSetterProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/NewInstanceMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/NewMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/NewMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/NewMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/NewMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/NewStaticMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/NewStaticMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/NewStaticMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/NewStaticMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java b/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/OwnedMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ReflectionMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java b/src/main/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ReflectorLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java b/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/TemporaryMethodKey.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java b/src/main/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/ThreadManagedMetaBeanProperty.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/TransformMetaMethod.java b/src/main/org/codehaus/groovy/runtime/metaclass/TransformMetaMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/TransformMetaMethod.java
rename to src/main/org/codehaus/groovy/runtime/metaclass/TransformMetaMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/package.html b/src/main/org/codehaus/groovy/runtime/metaclass/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/metaclass/package.html
rename to src/main/org/codehaus/groovy/runtime/metaclass/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/package.html b/src/main/org/codehaus/groovy/runtime/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/package.html
rename to src/main/org/codehaus/groovy/runtime/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java b/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java
rename to src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java b/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java
rename to src/main/org/codehaus/groovy/runtime/powerassert/PowerAssertionError.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/SourceText.java b/src/main/org/codehaus/groovy/runtime/powerassert/SourceText.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/SourceText.java
rename to src/main/org/codehaus/groovy/runtime/powerassert/SourceText.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java b/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java
rename to src/main/org/codehaus/groovy/runtime/powerassert/SourceTextNotAvailableException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/Value.java b/src/main/org/codehaus/groovy/runtime/powerassert/Value.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/Value.java
rename to src/main/org/codehaus/groovy/runtime/powerassert/Value.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/ValueRecorder.java b/src/main/org/codehaus/groovy/runtime/powerassert/ValueRecorder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/powerassert/ValueRecorder.java
rename to src/main/org/codehaus/groovy/runtime/powerassert/ValueRecorder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/BigDecimalMath.java b/src/main/org/codehaus/groovy/runtime/typehandling/BigDecimalMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/BigDecimalMath.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/BigDecimalMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java b/src/main/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/BigIntegerMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java b/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java b/src/main/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/FloatingPointMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java b/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/GroovyCastException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/IntegerMath.java b/src/main/org/codehaus/groovy/runtime/typehandling/IntegerMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/IntegerMath.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/IntegerMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/LongMath.java b/src/main/org/codehaus/groovy/runtime/typehandling/LongMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/LongMath.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/LongMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/NumberMath.java b/src/main/org/codehaus/groovy/runtime/typehandling/NumberMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/NumberMath.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/NumberMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/NumberMathModificationInfo.java b/src/main/org/codehaus/groovy/runtime/typehandling/NumberMathModificationInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/NumberMathModificationInfo.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/NumberMathModificationInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java b/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
rename to src/main/org/codehaus/groovy/runtime/typehandling/ShortTypeHandling.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/package.html b/src/main/org/codehaus/groovy/runtime/typehandling/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/typehandling/package.html
rename to src/main/org/codehaus/groovy/runtime/typehandling/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/BooleanWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/BooleanWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/BooleanWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/BooleanWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/ByteWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/ByteWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/ByteWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/ByteWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/CharWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/CharWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/CharWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/CharWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/DoubleWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/DoubleWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/DoubleWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/DoubleWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/FloatWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/FloatWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/FloatWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/FloatWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/GroovyObjectWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/GroovyObjectWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/GroovyObjectWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/GroovyObjectWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/IntWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/IntWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/IntWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/IntWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/LongWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/LongWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/LongWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/LongWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/PojoWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/PojoWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/PojoWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/PojoWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/ShortWrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/ShortWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/ShortWrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/ShortWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/Wrapper.java b/src/main/org/codehaus/groovy/runtime/wrappers/Wrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/Wrapper.java
rename to src/main/org/codehaus/groovy/runtime/wrappers/Wrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/package.html b/src/main/org/codehaus/groovy/runtime/wrappers/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/runtime/wrappers/package.html
rename to src/main/org/codehaus/groovy/runtime/wrappers/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/ASTHelper.java b/src/main/org/codehaus/groovy/syntax/ASTHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/ASTHelper.java
rename to src/main/org/codehaus/groovy/syntax/ASTHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/CSTNode.java b/src/main/org/codehaus/groovy/syntax/CSTNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/CSTNode.java
rename to src/main/org/codehaus/groovy/syntax/CSTNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Numbers.java b/src/main/org/codehaus/groovy/syntax/Numbers.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Numbers.java
rename to src/main/org/codehaus/groovy/syntax/Numbers.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/ParserException.java b/src/main/org/codehaus/groovy/syntax/ParserException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/ParserException.java
rename to src/main/org/codehaus/groovy/syntax/ParserException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/ReadException.java b/src/main/org/codehaus/groovy/syntax/ReadException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/ReadException.java
rename to src/main/org/codehaus/groovy/syntax/ReadException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Reduction.java b/src/main/org/codehaus/groovy/syntax/Reduction.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Reduction.java
rename to src/main/org/codehaus/groovy/syntax/Reduction.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java b/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/RuntimeParserException.java
rename to src/main/org/codehaus/groovy/syntax/RuntimeParserException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/SyntaxException.java b/src/main/org/codehaus/groovy/syntax/SyntaxException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/SyntaxException.java
rename to src/main/org/codehaus/groovy/syntax/SyntaxException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Token.java b/src/main/org/codehaus/groovy/syntax/Token.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Token.java
rename to src/main/org/codehaus/groovy/syntax/Token.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/TokenException.java b/src/main/org/codehaus/groovy/syntax/TokenException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/TokenException.java
rename to src/main/org/codehaus/groovy/syntax/TokenException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java b/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/TokenMismatchException.java
rename to src/main/org/codehaus/groovy/syntax/TokenMismatchException.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Types.java b/src/main/org/codehaus/groovy/syntax/Types.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/Types.java
rename to src/main/org/codehaus/groovy/syntax/Types.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/package.html b/src/main/org/codehaus/groovy/syntax/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/syntax/package.html
rename to src/main/org/codehaus/groovy/syntax/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/Compiler.java b/src/main/org/codehaus/groovy/tools/Compiler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/Compiler.java
rename to src/main/org/codehaus/groovy/tools/Compiler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/DgmConverter.java b/src/main/org/codehaus/groovy/tools/DgmConverter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/DgmConverter.java
rename to src/main/org/codehaus/groovy/tools/DgmConverter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/ErrorReporter.java b/src/main/org/codehaus/groovy/tools/ErrorReporter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/ErrorReporter.java
rename to src/main/org/codehaus/groovy/tools/ErrorReporter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
rename to src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GrapeMain.groovy b/src/main/org/codehaus/groovy/tools/GrapeMain.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GrapeMain.groovy
rename to src/main/org/codehaus/groovy/tools/GrapeMain.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GrapeUtil.java b/src/main/org/codehaus/groovy/tools/GrapeUtil.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GrapeUtil.java
rename to src/main/org/codehaus/groovy/tools/GrapeUtil.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GroovyClass.java b/src/main/org/codehaus/groovy/tools/GroovyClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GroovyClass.java
rename to src/main/org/codehaus/groovy/tools/GroovyClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GroovyStarter.java b/src/main/org/codehaus/groovy/tools/GroovyStarter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/GroovyStarter.java
rename to src/main/org/codehaus/groovy/tools/GroovyStarter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/LoaderConfiguration.java b/src/main/org/codehaus/groovy/tools/LoaderConfiguration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/LoaderConfiguration.java
rename to src/main/org/codehaus/groovy/tools/LoaderConfiguration.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/RootLoader.java b/src/main/org/codehaus/groovy/tools/RootLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/RootLoader.java
rename to src/main/org/codehaus/groovy/tools/RootLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/StringHelper.java b/src/main/org/codehaus/groovy/tools/StringHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/StringHelper.java
rename to src/main/org/codehaus/groovy/tools/StringHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/Utilities.java b/src/main/org/codehaus/groovy/tools/Utilities.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/Utilities.java
rename to src/main/org/codehaus/groovy/tools/Utilities.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy b/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy
rename to src/main/org/codehaus/groovy/tools/ast/TransformTestHelper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java b/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java
rename to src/main/org/codehaus/groovy/tools/gse/DependencyTracker.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java b/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/gse/StringSetMap.java
rename to src/main/org/codehaus/groovy/tools/gse/StringSetMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java b/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
rename to src/main/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaAwareResolveVisitor.java b/src/main/org/codehaus/groovy/tools/javac/JavaAwareResolveVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaAwareResolveVisitor.java
rename to src/main/org/codehaus/groovy/tools/javac/JavaAwareResolveVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java b/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java
rename to src/main/org/codehaus/groovy/tools/javac/JavaCompiler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaCompilerFactory.java b/src/main/org/codehaus/groovy/tools/javac/JavaCompilerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaCompilerFactory.java
rename to src/main/org/codehaus/groovy/tools/javac/JavaCompilerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaStubCompilationUnit.java b/src/main/org/codehaus/groovy/tools/javac/JavaStubCompilationUnit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaStubCompilationUnit.java
rename to src/main/org/codehaus/groovy/tools/javac/JavaStubCompilationUnit.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java b/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
rename to src/main/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavacCompilerFactory.java b/src/main/org/codehaus/groovy/tools/javac/JavacCompilerFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavacCompilerFactory.java
rename to src/main/org/codehaus/groovy/tools/javac/JavacCompilerFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
rename to src/main/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/package.html b/src/main/org/codehaus/groovy/tools/javac/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/javac/package.html
rename to src/main/org/codehaus/groovy/tools/javac/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/package.html b/src/main/org/codehaus/groovy/tools/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/package.html
rename to src/main/org/codehaus/groovy/tools/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/IO.java b/src/main/org/codehaus/groovy/tools/shell/IO.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/IO.java
rename to src/main/org/codehaus/groovy/tools/shell/IO.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/util/Logger.java b/src/main/org/codehaus/groovy/tools/shell/util/Logger.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/util/Logger.java
rename to src/main/org/codehaus/groovy/tools/shell/util/Logger.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java b/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
rename to src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java b/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
rename to src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/xml/package.html b/src/main/org/codehaus/groovy/tools/xml/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/tools/xml/package.html
rename to src/main/org/codehaus/groovy/tools/xml/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy b/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy
rename to src/main/org/codehaus/groovy/transform/ASTTestTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTransformation.java b/src/main/org/codehaus/groovy/transform/ASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/ASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java b/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java
rename to src/main/org/codehaus/groovy/transform/ASTTransformationCollectorCodeVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java b/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java
rename to src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AbstractASTTransformUtil.java b/src/main/org/codehaus/groovy/transform/AbstractASTTransformUtil.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AbstractASTTransformUtil.java
rename to src/main/org/codehaus/groovy/transform/AbstractASTTransformUtil.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java b/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java b/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/AbstractInterruptibleASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
rename to src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java b/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/BaseScriptASTTransformation.java b/src/main/org/codehaus/groovy/transform/BaseScriptASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/BaseScriptASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/BaseScriptASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/BuilderASTTransformation.java b/src/main/org/codehaus/groovy/transform/BuilderASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/BuilderASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/BuilderASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/CanonicalASTTransformation.java b/src/main/org/codehaus/groovy/transform/CanonicalASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/CanonicalASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/CanonicalASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java b/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/CompileDynamicProcessor.java b/src/main/org/codehaus/groovy/transform/CompileDynamicProcessor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/CompileDynamicProcessor.java
rename to src/main/org/codehaus/groovy/transform/CompileDynamicProcessor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ConditionalInterruptibleASTTransformation.groovy b/src/main/org/codehaus/groovy/transform/ConditionalInterruptibleASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ConditionalInterruptibleASTTransformation.groovy
rename to src/main/org/codehaus/groovy/transform/ConditionalInterruptibleASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java b/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/EqualsAndHashCodeASTTransformation.java b/src/main/org/codehaus/groovy/transform/EqualsAndHashCodeASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/EqualsAndHashCodeASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/EqualsAndHashCodeASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java b/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/ExternalizeMethodsASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ExternalizeVerifierASTTransformation.java b/src/main/org/codehaus/groovy/transform/ExternalizeVerifierASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ExternalizeVerifierASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/ExternalizeVerifierASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/FieldASTTransformation.java b/src/main/org/codehaus/groovy/transform/FieldASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/FieldASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/FieldASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/GroovyASTTransformation.java b/src/main/org/codehaus/groovy/transform/GroovyASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/GroovyASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/GroovyASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/GroovyASTTransformationClass.java b/src/main/org/codehaus/groovy/transform/GroovyASTTransformationClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/GroovyASTTransformationClass.java
rename to src/main/org/codehaus/groovy/transform/GroovyASTTransformationClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java b/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java b/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/IndexedPropertyASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java b/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/InheritConstructorsASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java b/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/LazyASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/LazyASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/LogASTTransformation.java b/src/main/org/codehaus/groovy/transform/LogASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/LogASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/LogASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java b/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/MemoizedASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java b/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/NewifyASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java b/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/PackageScopeASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java b/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java b/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/SingletonASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SourceURIASTTransformation.java b/src/main/org/codehaus/groovy/transform/SourceURIASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SourceURIASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/SourceURIASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/StaticTypesTransformation.java b/src/main/org/codehaus/groovy/transform/StaticTypesTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/StaticTypesTransformation.java
rename to src/main/org/codehaus/groovy/transform/StaticTypesTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java b/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ThreadInterruptibleASTTransformation.groovy b/src/main/org/codehaus/groovy/transform/ThreadInterruptibleASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ThreadInterruptibleASTTransformation.groovy
rename to src/main/org/codehaus/groovy/transform/ThreadInterruptibleASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/TimedInterruptibleASTTransformation.groovy b/src/main/org/codehaus/groovy/transform/TimedInterruptibleASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/TimedInterruptibleASTTransformation.groovy
rename to src/main/org/codehaus/groovy/transform/TimedInterruptibleASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ToStringASTTransformation.java b/src/main/org/codehaus/groovy/transform/ToStringASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/ToStringASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/ToStringASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java b/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/ListOfExpressionsExpression.java b/src/main/org/codehaus/groovy/transform/sc/ListOfExpressionsExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/ListOfExpressionsExpression.java
rename to src/main/org/codehaus/groovy/transform/sc/ListOfExpressionsExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/StaticCompilationMetadataKeys.java b/src/main/org/codehaus/groovy/transform/sc/StaticCompilationMetadataKeys.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/StaticCompilationMetadataKeys.java
rename to src/main/org/codehaus/groovy/transform/sc/StaticCompilationMetadataKeys.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java b/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
rename to src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java b/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
rename to src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java b/src/main/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
rename to src/main/org/codehaus/groovy/transform/sc/TemporaryVariableExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/CastExpressionOptimizer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/CastExpressionOptimizer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/CastExpressionOptimizer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/CastExpressionOptimizer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/ClosureExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/ClosureExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/ClosureExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/ClosureExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/CompareIdentityExpression.java b/src/main/org/codehaus/groovy/transform/sc/transformers/CompareIdentityExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/CompareIdentityExpression.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/CompareIdentityExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java b/src/main/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/CompareToNullExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/ConstructorCallTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/ConstructorCallTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/ConstructorCallTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/ConstructorCallTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/ListExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/ListExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/ListExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/ListExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/RangeExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/RangeExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/RangeExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/RangeExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/StaticCompilationTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/StaticMethodCallExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/StaticMethodCallExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/StaticMethodCallExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/StaticMethodCallExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
rename to src/main/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
rename to src/main/org/codehaus/groovy/transform/stc/AbstractTypeCheckingExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java
rename to src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/DelegationMetadata.java b/src/main/org/codehaus/groovy/transform/stc/DelegationMetadata.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/DelegationMetadata.java
rename to src/main/org/codehaus/groovy/transform/stc/DelegationMetadata.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java b/src/main/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java
rename to src/main/org/codehaus/groovy/transform/stc/ExtensionMethodNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java b/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java
rename to src/main/org/codehaus/groovy/transform/stc/GroovyTypeCheckingExtensionSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java b/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java
rename to src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/Receiver.java b/src/main/org/codehaus/groovy/transform/stc/Receiver.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/Receiver.java
rename to src/main/org/codehaus/groovy/transform/stc/Receiver.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SecondPassExpression.java b/src/main/org/codehaus/groovy/transform/stc/SecondPassExpression.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SecondPassExpression.java
rename to src/main/org/codehaus/groovy/transform/stc/SecondPassExpression.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SharedVariableCollector.java b/src/main/org/codehaus/groovy/transform/stc/SharedVariableCollector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SharedVariableCollector.java
rename to src/main/org/codehaus/groovy/transform/stc/SharedVariableCollector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SignatureCodec.java b/src/main/org/codehaus/groovy/transform/stc/SignatureCodec.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SignatureCodec.java
rename to src/main/org/codehaus/groovy/transform/stc/SignatureCodec.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java b/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java
rename to src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
rename to src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
rename to src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/StaticTypesMarker.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypesMarker.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/StaticTypesMarker.java
rename to src/main/org/codehaus/groovy/transform/stc/StaticTypesMarker.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java
rename to src/main/org/codehaus/groovy/transform/stc/TraitTypeCheckingExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java b/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
rename to src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java
rename to src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/UnionTypeClassNode.java b/src/main/org/codehaus/groovy/transform/stc/UnionTypeClassNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/stc/UnionTypeClassNode.java
rename to src/main/org/codehaus/groovy/transform/stc/UnionTypeClassNode.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy b/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/CollectRecursiveCalls.groovy b/src/main/org/codehaus/groovy/transform/tailrec/CollectRecursiveCalls.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/CollectRecursiveCalls.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/CollectRecursiveCalls.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/HasRecursiveCalls.groovy b/src/main/org/codehaus/groovy/transform/tailrec/HasRecursiveCalls.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/HasRecursiveCalls.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/HasRecursiveCalls.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy b/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/RecursivenessTester.groovy b/src/main/org/codehaus/groovy/transform/tailrec/RecursivenessTester.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/RecursivenessTester.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/RecursivenessTester.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosures.groovy b/src/main/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosures.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosures.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosures.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverter.groovy b/src/main/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverter.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/StatementReplacer.groovy b/src/main/org/codehaus/groovy/transform/tailrec/StatementReplacer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/StatementReplacer.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/StatementReplacer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.groovy b/src/main/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverter.groovy b/src/main/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverter.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/VariableAccessReplacer.groovy b/src/main/org/codehaus/groovy/transform/tailrec/VariableAccessReplacer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/VariableAccessReplacer.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/VariableAccessReplacer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy b/src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionTransformer.groovy b/src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionTransformer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionTransformer.groovy
rename to src/main/org/codehaus/groovy/transform/tailrec/VariableExpressionTransformer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java b/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java
rename to src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
rename to src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
rename to src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java b/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java
rename to src/main/org/codehaus/groovy/transform/trait/TraitComposer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitHelpersTuple.java b/src/main/org/codehaus/groovy/transform/trait/TraitHelpersTuple.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitHelpersTuple.java
rename to src/main/org/codehaus/groovy/transform/trait/TraitHelpersTuple.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java b/src/main/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java
rename to src/main/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/Traits.java b/src/main/org/codehaus/groovy/transform/trait/Traits.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/transform/trait/Traits.java
rename to src/main/org/codehaus/groovy/transform/trait/Traits.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/AbstractConcurrentDoubleKeyMap.java b/src/main/org/codehaus/groovy/util/AbstractConcurrentDoubleKeyMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/AbstractConcurrentDoubleKeyMap.java
rename to src/main/org/codehaus/groovy/util/AbstractConcurrentDoubleKeyMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java b/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java
rename to src/main/org/codehaus/groovy/util/AbstractConcurrentMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java b/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java
rename to src/main/org/codehaus/groovy/util/AbstractConcurrentMapBase.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ArrayIterator.java b/src/main/org/codehaus/groovy/util/ArrayIterator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ArrayIterator.java
rename to src/main/org/codehaus/groovy/util/ArrayIterator.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ComplexKeyHashMap.java b/src/main/org/codehaus/groovy/util/ComplexKeyHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ComplexKeyHashMap.java
rename to src/main/org/codehaus/groovy/util/ComplexKeyHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/DoubleKeyHashMap.java b/src/main/org/codehaus/groovy/util/DoubleKeyHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/DoubleKeyHashMap.java
rename to src/main/org/codehaus/groovy/util/DoubleKeyHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/FastArray.java b/src/main/org/codehaus/groovy/util/FastArray.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/FastArray.java
rename to src/main/org/codehaus/groovy/util/FastArray.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/Finalizable.java b/src/main/org/codehaus/groovy/util/Finalizable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/Finalizable.java
rename to src/main/org/codehaus/groovy/util/Finalizable.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/HashCodeHelper.java b/src/main/org/codehaus/groovy/util/HashCodeHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/HashCodeHelper.java
rename to src/main/org/codehaus/groovy/util/HashCodeHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/LazyReference.java b/src/main/org/codehaus/groovy/util/LazyReference.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/LazyReference.java
rename to src/main/org/codehaus/groovy/util/LazyReference.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ListHashMap.java b/src/main/org/codehaus/groovy/util/ListHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ListHashMap.java
rename to src/main/org/codehaus/groovy/util/ListHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/LockableObject.java b/src/main/org/codehaus/groovy/util/LockableObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/LockableObject.java
rename to src/main/org/codehaus/groovy/util/LockableObject.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java b/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java
rename to src/main/org/codehaus/groovy/util/ManagedConcurrentMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedConcurrentValueMap.java b/src/main/org/codehaus/groovy/util/ManagedConcurrentValueMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedConcurrentValueMap.java
rename to src/main/org/codehaus/groovy/util/ManagedConcurrentValueMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedDoubleKeyMap.java b/src/main/org/codehaus/groovy/util/ManagedDoubleKeyMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedDoubleKeyMap.java
rename to src/main/org/codehaus/groovy/util/ManagedDoubleKeyMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedLinkedList.java b/src/main/org/codehaus/groovy/util/ManagedLinkedList.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedLinkedList.java
rename to src/main/org/codehaus/groovy/util/ManagedLinkedList.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedReference.java b/src/main/org/codehaus/groovy/util/ManagedReference.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ManagedReference.java
rename to src/main/org/codehaus/groovy/util/ManagedReference.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/Reference.java b/src/main/org/codehaus/groovy/util/Reference.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/Reference.java
rename to src/main/org/codehaus/groovy/util/Reference.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReferenceBundle.java b/src/main/org/codehaus/groovy/util/ReferenceBundle.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReferenceBundle.java
rename to src/main/org/codehaus/groovy/util/ReferenceBundle.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReferenceManager.java b/src/main/org/codehaus/groovy/util/ReferenceManager.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReferenceManager.java
rename to src/main/org/codehaus/groovy/util/ReferenceManager.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReferenceType.java b/src/main/org/codehaus/groovy/util/ReferenceType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReferenceType.java
rename to src/main/org/codehaus/groovy/util/ReferenceType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReleaseInfo.java b/src/main/org/codehaus/groovy/util/ReleaseInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/ReleaseInfo.java
rename to src/main/org/codehaus/groovy/util/ReleaseInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/SingleKeyHashMap.java b/src/main/org/codehaus/groovy/util/SingleKeyHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/SingleKeyHashMap.java
rename to src/main/org/codehaus/groovy/util/SingleKeyHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/StringUtil.groovy b/src/main/org/codehaus/groovy/util/StringUtil.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/StringUtil.groovy
rename to src/main/org/codehaus/groovy/util/StringUtil.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/TripleKeyHashMap.java b/src/main/org/codehaus/groovy/util/TripleKeyHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/util/TripleKeyHashMap.java
rename to src/main/org/codehaus/groovy/util/TripleKeyHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java b/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java
rename to src/main/org/codehaus/groovy/vmplugin/VMPlugin.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/VMPluginFactory.java b/src/main/org/codehaus/groovy/vmplugin/VMPluginFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/VMPluginFactory.java
rename to src/main/org/codehaus/groovy/vmplugin/VMPluginFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/package.html b/src/main/org/codehaus/groovy/vmplugin/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/package.html
rename to src/main/org/codehaus/groovy/vmplugin/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java b/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java
rename to src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java b/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
rename to src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java b/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java
rename to src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/package.html b/src/main/org/codehaus/groovy/vmplugin/v5/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v5/package.html
rename to src/main/org/codehaus/groovy/vmplugin/v5/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v6/Java6.java b/src/main/org/codehaus/groovy/vmplugin/v6/Java6.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v6/Java6.java
rename to src/main/org/codehaus/groovy/vmplugin/v6/Java6.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java b/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/Java7.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java b/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/Selector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/TypeHelper.java b/src/main/org/codehaus/groovy/vmplugin/v7/TypeHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/TypeHelper.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/TypeHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java b/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java
rename to src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java
diff --git a/groovy/upstream/groovy-2.4.3/src/main/overview.html b/src/main/overview.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/overview.html
rename to src/main/overview.html
diff --git a/groovy/upstream/groovy-2.4.3/src/main/overviewj.html b/src/main/overviewj.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/main/overviewj.html
rename to src/main/overviewj.html
diff --git a/groovy/upstream/groovy-2.4.3/src/native/base.c b/src/native/base.c
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/native/base.c
rename to src/native/base.c
diff --git a/groovy/upstream/groovy-2.4.3/src/resources/groovy/grape/defaultGrapeConfig.xml b/src/resources/groovy/grape/defaultGrapeConfig.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/resources/groovy/grape/defaultGrapeConfig.xml
rename to src/resources/groovy/grape/defaultGrapeConfig.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/css/style.css b/src/spec/assets/css/style.css
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/css/style.css
rename to src/spec/assets/css/style.css
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/css/view-example.css b/src/spec/assets/css/view-example.css
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/css/view-example.css
rename to src/spec/assets/css/view-example.css
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/additionalmodules.png b/src/spec/assets/img/additionalmodules.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/additionalmodules.png
rename to src/spec/assets/img/additionalmodules.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/console1.png b/src/spec/assets/img/console1.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/console1.png
rename to src/spec/assets/img/console1.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/console2.png b/src/spec/assets/img/console2.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/console2.png
rename to src/spec/assets/img/console2.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/console3.png b/src/spec/assets/img/console3.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/console3.png
rename to src/spec/assets/img/console3.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/console5.png b/src/spec/assets/img/console5.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/console5.png
rename to src/spec/assets/img/console5.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/console6.png b/src/spec/assets/img/console6.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/console6.png
rename to src/spec/assets/img/console6.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/console7.png b/src/spec/assets/img/console7.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/console7.png
rename to src/spec/assets/img/console7.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example1.png b/src/spec/assets/img/example1.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example1.png
rename to src/spec/assets/img/example1.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example10.png b/src/spec/assets/img/example10.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example10.png
rename to src/spec/assets/img/example10.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example11.png b/src/spec/assets/img/example11.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example11.png
rename to src/spec/assets/img/example11.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example12.png b/src/spec/assets/img/example12.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example12.png
rename to src/spec/assets/img/example12.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example13.png b/src/spec/assets/img/example13.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example13.png
rename to src/spec/assets/img/example13.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example14.png b/src/spec/assets/img/example14.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example14.png
rename to src/spec/assets/img/example14.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example15.png b/src/spec/assets/img/example15.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example15.png
rename to src/spec/assets/img/example15.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example16.png b/src/spec/assets/img/example16.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example16.png
rename to src/spec/assets/img/example16.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example17.png b/src/spec/assets/img/example17.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example17.png
rename to src/spec/assets/img/example17.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example18.png b/src/spec/assets/img/example18.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example18.png
rename to src/spec/assets/img/example18.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example19.png b/src/spec/assets/img/example19.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example19.png
rename to src/spec/assets/img/example19.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example2.png b/src/spec/assets/img/example2.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example2.png
rename to src/spec/assets/img/example2.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example4.png b/src/spec/assets/img/example4.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example4.png
rename to src/spec/assets/img/example4.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example5.png b/src/spec/assets/img/example5.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example5.png
rename to src/spec/assets/img/example5.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example7.png b/src/spec/assets/img/example7.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example7.png
rename to src/spec/assets/img/example7.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example8.png b/src/spec/assets/img/example8.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example8.png
rename to src/spec/assets/img/example8.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/example9.png b/src/spec/assets/img/example9.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/example9.png
rename to src/spec/assets/img/example9.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/fileassociation.png b/src/spec/assets/img/fileassociation.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/fileassociation.png
rename to src/spec/assets/img/fileassociation.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/github1.png b/src/spec/assets/img/github1.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/github1.png
rename to src/spec/assets/img/github1.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/github2.png b/src/spec/assets/img/github2.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/github2.png
rename to src/spec/assets/img/github2.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/github3.png b/src/spec/assets/img/github3.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/github3.png
rename to src/spec/assets/img/github3.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/github4.png b/src/spec/assets/img/github4.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/github4.png
rename to src/spec/assets/img/github4.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/github5.png b/src/spec/assets/img/github5.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/github5.png
rename to src/spec/assets/img/github5.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/github6.png b/src/spec/assets/img/github6.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/github6.png
rename to src/spec/assets/img/github6.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/githubfork.png b/src/spec/assets/img/githubfork.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/githubfork.png
rename to src/spec/assets/img/githubfork.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/githubhomepanel.png b/src/spec/assets/img/githubhomepanel.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/githubhomepanel.png
rename to src/spec/assets/img/githubhomepanel.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/githubsearch.png b/src/spec/assets/img/githubsearch.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/githubsearch.png
rename to src/spec/assets/img/githubsearch.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/groovy.png b/src/spec/assets/img/groovy.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/groovy.png
rename to src/spec/assets/img/groovy.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/groovy1.png b/src/spec/assets/img/groovy1.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/groovy1.png
rename to src/spec/assets/img/groovy1.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/native.jpg b/src/spec/assets/img/native.jpg
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/native.jpg
rename to src/spec/assets/img/native.jpg
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/outdir.png b/src/spec/assets/img/outdir.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/outdir.png
rename to src/spec/assets/img/outdir.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/repolist.png b/src/spec/assets/img/repolist.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/repolist.png
rename to src/spec/assets/img/repolist.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/setup.png b/src/spec/assets/img/setup.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/setup.png
rename to src/spec/assets/img/setup.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/teamcity.png b/src/spec/assets/img/teamcity.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/teamcity.png
rename to src/spec/assets/img/teamcity.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/img/variables.jpg b/src/spec/assets/img/variables.jpg
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/img/variables.jpg
rename to src/spec/assets/img/variables.jpg
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/assets/js/view-example.js b/src/spec/assets/js/view-example.js
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/assets/js/view-example.js
rename to src/spec/assets/js/view-example.js
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/ChainOfResponsibilityClasses.gif b/src/spec/doc/assets/img/ChainOfResponsibilityClasses.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/ChainOfResponsibilityClasses.gif
rename to src/spec/doc/assets/img/ChainOfResponsibilityClasses.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/CompositeClasses.gif b/src/spec/doc/assets/img/CompositeClasses.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/CompositeClasses.gif
rename to src/spec/doc/assets/img/CompositeClasses.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/CompositeComponents.gif b/src/spec/doc/assets/img/CompositeComponents.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/CompositeComponents.gif
rename to src/spec/doc/assets/img/CompositeComponents.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/StrategyClasses.gif b/src/spec/doc/assets/img/StrategyClasses.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/StrategyClasses.gif
rename to src/spec/doc/assets/img/StrategyClasses.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/TemplateMethodClasses.gif b/src/spec/doc/assets/img/TemplateMethodClasses.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/TemplateMethodClasses.gif
rename to src/spec/doc/assets/img/TemplateMethodClasses.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/a380.jpg b/src/spec/doc/assets/img/a380.jpg
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/a380.jpg
rename to src/spec/doc/assets/img/a380.jpg
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/additionalmodules.png b/src/spec/doc/assets/img/additionalmodules.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/additionalmodules.png
rename to src/spec/doc/assets/img/additionalmodules.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/b797-hoax.jpg b/src/spec/doc/assets/img/b797-hoax.jpg
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/b797-hoax.jpg
rename to src/spec/doc/assets/img/b797-hoax.jpg
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/catalina.gif b/src/spec/doc/assets/img/catalina.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/catalina.gif
rename to src/spec/doc/assets/img/catalina.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/fileassociation.png b/src/spec/doc/assets/img/fileassociation.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/fileassociation.png
rename to src/spec/doc/assets/img/fileassociation.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/gconsole-toolbar.png b/src/spec/doc/assets/img/gconsole-toolbar.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/gconsole-toolbar.png
rename to src/spec/doc/assets/img/gconsole-toolbar.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/jconsole-implicit-export.png b/src/spec/doc/assets/img/jconsole-implicit-export.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/jconsole-implicit-export.png
rename to src/spec/doc/assets/img/jconsole-implicit-export.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/jconsole.gif b/src/spec/doc/assets/img/jconsole.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/jconsole.gif
rename to src/spec/doc/assets/img/jconsole.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/native.jpg b/src/spec/doc/assets/img/native.jpg
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/native.jpg
rename to src/spec/doc/assets/img/native.jpg
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/oc4jpie.gif b/src/spec/doc/assets/img/oc4jpie.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/oc4jpie.gif
rename to src/spec/doc/assets/img/oc4jpie.gif
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/outdir.png b/src/spec/doc/assets/img/outdir.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/outdir.png
rename to src/spec/doc/assets/img/outdir.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/setup.png b/src/spec/doc/assets/img/setup.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/setup.png
rename to src/spec/doc/assets/img/setup.png
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/variables.jpg b/src/spec/doc/assets/img/variables.jpg
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/assets/img/variables.jpg
rename to src/spec/doc/assets/img/variables.jpg
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/contributors.adoc b/src/spec/doc/contributors.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/contributors.adoc
rename to src/spec/doc/contributors.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-closures.adoc b/src/spec/doc/core-closures.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-closures.adoc
rename to src/spec/doc/core-closures.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-differences-java.adoc b/src/spec/doc/core-differences-java.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-differences-java.adoc
rename to src/spec/doc/core-differences-java.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-domain-specific-languages.adoc b/src/spec/doc/core-domain-specific-languages.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-domain-specific-languages.adoc
rename to src/spec/doc/core-domain-specific-languages.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-gdk.adoc b/src/spec/doc/core-gdk.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-gdk.adoc
rename to src/spec/doc/core-gdk.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-getting-started.adoc b/src/spec/doc/core-getting-started.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-getting-started.adoc
rename to src/spec/doc/core-getting-started.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-introduction.adoc b/src/spec/doc/core-introduction.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-introduction.adoc
rename to src/spec/doc/core-introduction.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-metaprogramming.adoc b/src/spec/doc/core-metaprogramming.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-metaprogramming.adoc
rename to src/spec/doc/core-metaprogramming.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-object-orientation.adoc b/src/spec/doc/core-object-orientation.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-object-orientation.adoc
rename to src/spec/doc/core-object-orientation.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-operators.adoc b/src/spec/doc/core-operators.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-operators.adoc
rename to src/spec/doc/core-operators.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-program-structure.adoc b/src/spec/doc/core-program-structure.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-program-structure.adoc
rename to src/spec/doc/core-program-structure.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-semantics.adoc b/src/spec/doc/core-semantics.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-semantics.adoc
rename to src/spec/doc/core-semantics.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-syntax.adoc b/src/spec/doc/core-syntax.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-syntax.adoc
rename to src/spec/doc/core-syntax.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-testing-guide.adoc b/src/spec/doc/core-testing-guide.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-testing-guide.adoc
rename to src/spec/doc/core-testing-guide.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/core-traits.adoc b/src/spec/doc/core-traits.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/core-traits.adoc
rename to src/spec/doc/core-traits.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-abstract-factory.adoc b/src/spec/doc/design-pattern-abstract-factory.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-abstract-factory.adoc
rename to src/spec/doc/design-pattern-abstract-factory.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-adapter.adoc b/src/spec/doc/design-pattern-adapter.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-adapter.adoc
rename to src/spec/doc/design-pattern-adapter.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-bouncer.adoc b/src/spec/doc/design-pattern-bouncer.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-bouncer.adoc
rename to src/spec/doc/design-pattern-bouncer.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-chain-of-responsibility.adoc b/src/spec/doc/design-pattern-chain-of-responsibility.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-chain-of-responsibility.adoc
rename to src/spec/doc/design-pattern-chain-of-responsibility.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-composite.adoc b/src/spec/doc/design-pattern-composite.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-composite.adoc
rename to src/spec/doc/design-pattern-composite.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-decorator.adoc b/src/spec/doc/design-pattern-decorator.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-decorator.adoc
rename to src/spec/doc/design-pattern-decorator.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-delegation.adoc b/src/spec/doc/design-pattern-delegation.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-delegation.adoc
rename to src/spec/doc/design-pattern-delegation.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-flyweight.adoc b/src/spec/doc/design-pattern-flyweight.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-flyweight.adoc
rename to src/spec/doc/design-pattern-flyweight.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-in-groovy.adoc b/src/spec/doc/design-pattern-in-groovy.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-in-groovy.adoc
rename to src/spec/doc/design-pattern-in-groovy.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-iterator.adoc b/src/spec/doc/design-pattern-iterator.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-iterator.adoc
rename to src/spec/doc/design-pattern-iterator.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-loan-my-resource.adoc b/src/spec/doc/design-pattern-loan-my-resource.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-loan-my-resource.adoc
rename to src/spec/doc/design-pattern-loan-my-resource.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-null-object.adoc b/src/spec/doc/design-pattern-null-object.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-null-object.adoc
rename to src/spec/doc/design-pattern-null-object.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-pimp-my-library.adoc b/src/spec/doc/design-pattern-pimp-my-library.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-pimp-my-library.adoc
rename to src/spec/doc/design-pattern-pimp-my-library.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-proxy.adoc b/src/spec/doc/design-pattern-proxy.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-proxy.adoc
rename to src/spec/doc/design-pattern-proxy.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-singleton.adoc b/src/spec/doc/design-pattern-singleton.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-singleton.adoc
rename to src/spec/doc/design-pattern-singleton.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-state.adoc b/src/spec/doc/design-pattern-state.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-state.adoc
rename to src/spec/doc/design-pattern-state.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-strategy.adoc b/src/spec/doc/design-pattern-strategy.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-strategy.adoc
rename to src/spec/doc/design-pattern-strategy.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-template-method.adoc b/src/spec/doc/design-pattern-template-method.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-template-method.adoc
rename to src/spec/doc/design-pattern-template-method.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-visitor.adoc b/src/spec/doc/design-pattern-visitor.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/design-pattern-visitor.adoc
rename to src/spec/doc/design-pattern-visitor.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/grape.adoc b/src/spec/doc/grape.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/grape.adoc
rename to src/spec/doc/grape.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/groovy-contributions.adoc b/src/spec/doc/groovy-contributions.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/groovy-contributions.adoc
rename to src/spec/doc/groovy-contributions.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/guide-integrating.adoc b/src/spec/doc/guide-integrating.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/guide-integrating.adoc
rename to src/spec/doc/guide-integrating.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/index.adoc b/src/spec/doc/index.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/index.adoc
rename to src/spec/doc/index.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/invokedynamic-support.adoc b/src/spec/doc/invokedynamic-support.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/invokedynamic-support.adoc
rename to src/spec/doc/invokedynamic-support.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/license.adoc b/src/spec/doc/license.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/license.adoc
rename to src/spec/doc/license.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/style-guide.adoc b/src/spec/doc/style-guide.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/style-guide.adoc
rename to src/spec/doc/style-guide.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/tools-groovyc.adoc b/src/spec/doc/tools-groovyc.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/tools-groovyc.adoc
rename to src/spec/doc/tools-groovyc.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/tools-groovyeclipse.adoc b/src/spec/doc/tools-groovyeclipse.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/tools-groovyeclipse.adoc
rename to src/spec/doc/tools-groovyeclipse.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/tools-ide.adoc b/src/spec/doc/tools-ide.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/tools-ide.adoc
rename to src/spec/doc/tools-ide.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/type-checking-extensions.adoc b/src/spec/doc/type-checking-extensions.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/type-checking-extensions.adoc
rename to src/spec/doc/type-checking-extensions.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/version-scheme.adoc b/src/spec/doc/version-scheme.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/version-scheme.adoc
rename to src/spec/doc/version-scheme.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/windows-nsis-installer.adoc b/src/spec/doc/windows-nsis-installer.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/windows-nsis-installer.adoc
rename to src/spec/doc/windows-nsis-installer.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/working-with-collections.adoc b/src/spec/doc/working-with-collections.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/working-with-collections.adoc
rename to src/spec/doc/working-with-collections.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/doc/working-with-io.adoc b/src/spec/doc/working-with-io.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/doc/working-with-io.adoc
rename to src/spec/doc/working-with-io.adoc
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
rename to src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModuleSpec b/src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModuleSpec
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModuleSpec
rename to src/spec/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModuleSpec
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/aftermethodcall.groovy b/src/spec/test-resources/aftermethodcall.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/aftermethodcall.groovy
rename to src/spec/test-resources/aftermethodcall.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/aftervisitclass.groovy b/src/spec/test-resources/aftervisitclass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/aftervisitclass.groovy
rename to src/spec/test-resources/aftervisitclass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/aftervisitmethod.groovy b/src/spec/test-resources/aftervisitmethod.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/aftervisitmethod.groovy
rename to src/spec/test-resources/aftervisitmethod.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/ambiguousmethods.groovy b/src/spec/test-resources/ambiguousmethods.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/ambiguousmethods.groovy
rename to src/spec/test-resources/ambiguousmethods.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/beforemethodcall.groovy b/src/spec/test-resources/beforemethodcall.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/beforemethodcall.groovy
rename to src/spec/test-resources/beforemethodcall.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/beforevisitclass.groovy b/src/spec/test-resources/beforevisitclass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/beforevisitclass.groovy
rename to src/spec/test-resources/beforevisitclass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/beforevisitmethod.groovy b/src/spec/test-resources/beforevisitmethod.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/beforevisitmethod.groovy
rename to src/spec/test-resources/beforevisitmethod.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/finish.groovy b/src/spec/test-resources/finish.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/finish.groovy
rename to src/spec/test-resources/finish.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/incompatibleassignment.groovy b/src/spec/test-resources/incompatibleassignment.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/incompatibleassignment.groovy
rename to src/spec/test-resources/incompatibleassignment.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/methodnotfound.groovy b/src/spec/test-resources/methodnotfound.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/methodnotfound.groovy
rename to src/spec/test-resources/methodnotfound.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/newmethod.groovy b/src/spec/test-resources/newmethod.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/newmethod.groovy
rename to src/spec/test-resources/newmethod.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/onmethodselection.groovy b/src/spec/test-resources/onmethodselection.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/onmethodselection.groovy
rename to src/spec/test-resources/onmethodselection.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/dependency1.groovy b/src/spec/test-resources/reloading/dependency1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/dependency1.groovy
rename to src/spec/test-resources/reloading/dependency1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/dependency2.groovy b/src/spec/test-resources/reloading/dependency2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/dependency2.groovy
rename to src/spec/test-resources/reloading/dependency2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/source1.groovy b/src/spec/test-resources/reloading/source1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/source1.groovy
rename to src/spec/test-resources/reloading/source1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/source2.groovy b/src/spec/test-resources/reloading/source2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/source2.groovy
rename to src/spec/test-resources/reloading/source2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/source3.groovy b/src/spec/test-resources/reloading/source3.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/reloading/source3.groovy
rename to src/spec/test-resources/reloading/source3.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/robotextension.groovy b/src/spec/test-resources/robotextension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/robotextension.groovy
rename to src/spec/test-resources/robotextension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/robotextension2.groovy b/src/spec/test-resources/robotextension2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/robotextension2.groovy
rename to src/spec/test-resources/robotextension2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/robotextension3.groovy b/src/spec/test-resources/robotextension3.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/robotextension3.groovy
rename to src/spec/test-resources/robotextension3.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/scoping.groovy b/src/spec/test-resources/scoping.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/scoping.groovy
rename to src/spec/test-resources/scoping.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/scoping_alt.groovy b/src/spec/test-resources/scoping_alt.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/scoping_alt.groovy
rename to src/spec/test-resources/scoping_alt.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/selfcheck.groovy b/src/spec/test-resources/selfcheck.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/selfcheck.groovy
rename to src/spec/test-resources/selfcheck.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/setup.groovy b/src/spec/test-resources/setup.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/setup.groovy
rename to src/spec/test-resources/setup.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/unresolvedattribute.groovy b/src/spec/test-resources/unresolvedattribute.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/unresolvedattribute.groovy
rename to src/spec/test-resources/unresolvedattribute.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/unresolvedproperty.groovy b/src/spec/test-resources/unresolvedproperty.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/unresolvedproperty.groovy
rename to src/spec/test-resources/unresolvedproperty.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test-resources/unresolvedvariable.groovy b/src/spec/test-resources/unresolvedvariable.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test-resources/unresolvedvariable.groovy
rename to src/spec/test-resources/unresolvedvariable.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/BaseScriptSpecTest.groovy b/src/spec/test/BaseScriptSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/BaseScriptSpecTest.groovy
rename to src/spec/test/BaseScriptSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/ClassDesignASTTransformsTest.groovy b/src/spec/test/ClassDesignASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/ClassDesignASTTransformsTest.groovy
rename to src/spec/test/ClassDesignASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/ClassTest.groovy b/src/spec/test/ClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/ClassTest.groovy
rename to src/spec/test/ClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/CloningASTTransformsTest.groovy b/src/spec/test/CloningASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/CloningASTTransformsTest.groovy
rename to src/spec/test/CloningASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/ClosuresSpecTest.groovy b/src/spec/test/ClosuresSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/ClosuresSpecTest.groovy
rename to src/spec/test/ClosuresSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/CodeGenerationASTTransformsTest.groovy b/src/spec/test/CodeGenerationASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/CodeGenerationASTTransformsTest.groovy
rename to src/spec/test/CodeGenerationASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/CoercionTest.groovy b/src/spec/test/CoercionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/CoercionTest.groovy
rename to src/spec/test/CoercionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/CommandChainsTest.groovy b/src/spec/test/CommandChainsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/CommandChainsTest.groovy
rename to src/spec/test/CommandChainsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/CompilerDirectivesASTTransformsTest.groovy b/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
rename to src/spec/test/CompilerDirectivesASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/CustomizersTest.groovy b/src/spec/test/CustomizersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/CustomizersTest.groovy
rename to src/spec/test/CustomizersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy b/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
rename to src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/DelegatesToSpecTest.groovy b/src/spec/test/DelegatesToSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/DelegatesToSpecTest.groovy
rename to src/spec/test/DelegatesToSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/DesignPatternsTest.groovy b/src/spec/test/DesignPatternsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/DesignPatternsTest.groovy
rename to src/spec/test/DesignPatternsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/DifferencesFromJavaTest.groovy b/src/spec/test/DifferencesFromJavaTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/DifferencesFromJavaTest.groovy
rename to src/spec/test/DifferencesFromJavaTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/ExtensionModuleSpecTest.groovy b/src/spec/test/ExtensionModuleSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/ExtensionModuleSpecTest.groovy
rename to src/spec/test/ExtensionModuleSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/IntegrationTest.groovy b/src/spec/test/IntegrationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/IntegrationTest.groovy
rename to src/spec/test/IntegrationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/LogImprovementsASTTransformsTest.groovy b/src/spec/test/LogImprovementsASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/LogImprovementsASTTransformsTest.groovy
rename to src/spec/test/LogImprovementsASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/OperatorsTest.groovy b/src/spec/test/OperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/OperatorsTest.groovy
rename to src/spec/test/OperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/PackageTest.groovy b/src/spec/test/PackageTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/PackageTest.groovy
rename to src/spec/test/PackageTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/SaferScriptingASTTransformsTest.groovy b/src/spec/test/SaferScriptingASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/SaferScriptingASTTransformsTest.groovy
rename to src/spec/test/SaferScriptingASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/ScriptsAndClassesSpecTest.groovy b/src/spec/test/ScriptsAndClassesSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/ScriptsAndClassesSpecTest.groovy
rename to src/spec/test/ScriptsAndClassesSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/SemanticsTest.groovy b/src/spec/test/SemanticsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/SemanticsTest.groovy
rename to src/spec/test/SemanticsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/SwingASTTransformsTest.groovy b/src/spec/test/SwingASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/SwingASTTransformsTest.groovy
rename to src/spec/test/SwingASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/SyntaxTest.groovy b/src/spec/test/SyntaxTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/SyntaxTest.groovy
rename to src/spec/test/SyntaxTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/TestingASTTransformsTest.groovy b/src/spec/test/TestingASTTransformsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/TestingASTTransformsTest.groovy
rename to src/spec/test/TestingASTTransformsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/TraitsSpecificationTest.groovy b/src/spec/test/TraitsSpecificationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/TraitsSpecificationTest.groovy
rename to src/spec/test/TraitsSpecificationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/asciidoctor/Utils.groovy b/src/spec/test/asciidoctor/Utils.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/asciidoctor/Utils.groovy
rename to src/spec/test/asciidoctor/Utils.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/builder/BuilderSupportTest.groovy b/src/spec/test/builder/BuilderSupportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/builder/BuilderSupportTest.groovy
rename to src/spec/test/builder/BuilderSupportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/builder/ObjectGraphBuilderTest.groovy b/src/spec/test/builder/ObjectGraphBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/builder/ObjectGraphBuilderTest.groovy
rename to src/spec/test/builder/ObjectGraphBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/gdk/ConfigSlurperTest.groovy b/src/spec/test/gdk/ConfigSlurperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/gdk/ConfigSlurperTest.groovy
rename to src/spec/test/gdk/ConfigSlurperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/gdk/ExpandoTest.groovy b/src/spec/test/gdk/ExpandoTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/gdk/ExpandoTest.groovy
rename to src/spec/test/gdk/ExpandoTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/gdk/ObservableTest.groovy b/src/spec/test/gdk/ObservableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/gdk/ObservableTest.groovy
rename to src/spec/test/gdk/ObservableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/gdk/WorkingWithCollectionsTest.groovy b/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
rename to src/spec/test/gdk/WorkingWithCollectionsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/gdk/WorkingWithIOSpecTest.groovy b/src/spec/test/gdk/WorkingWithIOSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/gdk/WorkingWithIOSpecTest.groovy
rename to src/spec/test/gdk/WorkingWithIOSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy b/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy
rename to src/spec/test/metaprogramming/ASTXFormSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/CategoryTest.groovy b/src/spec/test/metaprogramming/CategoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/CategoryTest.groovy
rename to src/spec/test/metaprogramming/CategoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy b/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy
rename to src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy b/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
rename to src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/MyTransformToDebug.groovy b/src/spec/test/metaprogramming/MyTransformToDebug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/metaprogramming/MyTransformToDebug.groovy
rename to src/spec/test/metaprogramming/MyTransformToDebug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/objectorientation/MethodsTest.groovy b/src/spec/test/objectorientation/MethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/objectorientation/MethodsTest.groovy
rename to src/spec/test/objectorientation/MethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/semantics/GPathTest.groovy b/src/spec/test/semantics/GPathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/semantics/GPathTest.groovy
rename to src/spec/test/semantics/GPathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/semantics/LabelsTest.groovy b/src/spec/test/semantics/LabelsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/semantics/LabelsTest.groovy
rename to src/spec/test/semantics/LabelsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/semantics/OptionalityTest.groovy b/src/spec/test/semantics/OptionalityTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/semantics/OptionalityTest.groovy
rename to src/spec/test/semantics/OptionalityTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/semantics/PowerAssertTest.groovy b/src/spec/test/semantics/PowerAssertTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/semantics/PowerAssertTest.groovy
rename to src/spec/test/semantics/PowerAssertTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/semantics/TheGroovyTruthTest.groovy b/src/spec/test/semantics/TheGroovyTruthTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/semantics/TheGroovyTruthTest.groovy
rename to src/spec/test/semantics/TheGroovyTruthTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/support/MaxRetriesExtension.groovy b/src/spec/test/support/MaxRetriesExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/support/MaxRetriesExtension.groovy
rename to src/spec/test/support/MaxRetriesExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/support/StaticStringExtension.groovy b/src/spec/test/support/StaticStringExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/support/StaticStringExtension.groovy
rename to src/spec/test/support/StaticStringExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/GDKMethodTests.groovy b/src/spec/test/testingguide/GDKMethodTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/GDKMethodTests.groovy
rename to src/spec/test/testingguide/GDKMethodTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy b/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy
rename to src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/JUnit4ExampleTests.groovy b/src/spec/test/testingguide/JUnit4ExampleTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/JUnit4ExampleTests.groovy
rename to src/spec/test/testingguide/JUnit4ExampleTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/MockingExampleTests.groovy b/src/spec/test/testingguide/MockingExampleTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/testingguide/MockingExampleTests.groovy
rename to src/spec/test/testingguide/MockingExampleTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/thirdpartylib/MultiplyTwo.groovy b/src/spec/test/thirdpartylib/MultiplyTwo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/thirdpartylib/MultiplyTwo.groovy
rename to src/spec/test/thirdpartylib/MultiplyTwo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/OptionalTypingTest.groovy b/src/spec/test/typing/OptionalTypingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/OptionalTypingTest.groovy
rename to src/spec/test/typing/OptionalTypingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/PrecompiledExtension.groovy b/src/spec/test/typing/PrecompiledExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/PrecompiledExtension.groovy
rename to src/spec/test/typing/PrecompiledExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/PrecompiledJavaExtension.java b/src/spec/test/typing/PrecompiledJavaExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/PrecompiledJavaExtension.java
rename to src/spec/test/typing/PrecompiledJavaExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/Robot.groovy b/src/spec/test/typing/Robot.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/Robot.groovy
rename to src/spec/test/typing/Robot.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/StaticCompilationIntroTest.groovy b/src/spec/test/typing/StaticCompilationIntroTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/StaticCompilationIntroTest.groovy
rename to src/spec/test/typing/StaticCompilationIntroTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
rename to src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingHintsTest.groovy b/src/spec/test/typing/TypeCheckingHintsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingHintsTest.groovy
rename to src/spec/test/typing/TypeCheckingHintsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingJavaTest.java b/src/spec/test/typing/TypeCheckingJavaTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingJavaTest.java
rename to src/spec/test/typing/TypeCheckingJavaTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingTest.groovy b/src/spec/test/typing/TypeCheckingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/spec/test/typing/TypeCheckingTest.groovy
rename to src/spec/test/typing/TypeCheckingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/build.xml b/src/tck/build.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/build.xml
rename to src/tck/build.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/src/manifest.txt b/src/tck/src/manifest.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/src/manifest.txt
rename to src/tck/src/manifest.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/BatchGenerate.groovy b/src/tck/src/org/codehaus/groovy/tck/BatchGenerate.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/BatchGenerate.groovy
rename to src/tck/src/org/codehaus/groovy/tck/BatchGenerate.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/ClassicGroovyTestGeneratorHelper.java b/src/tck/src/org/codehaus/groovy/tck/ClassicGroovyTestGeneratorHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/ClassicGroovyTestGeneratorHelper.java
rename to src/tck/src/org/codehaus/groovy/tck/ClassicGroovyTestGeneratorHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/GenerateTestCases.java b/src/tck/src/org/codehaus/groovy/tck/GenerateTestCases.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/GenerateTestCases.java
rename to src/tck/src/org/codehaus/groovy/tck/GenerateTestCases.java
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/TestGenerator.groovy b/src/tck/src/org/codehaus/groovy/tck/TestGenerator.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/TestGenerator.groovy
rename to src/tck/src/org/codehaus/groovy/tck/TestGenerator.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/TestGeneratorHelper.java b/src/tck/src/org/codehaus/groovy/tck/TestGeneratorHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/src/org/codehaus/groovy/tck/TestGeneratorHelper.java
rename to src/tck/src/org/codehaus/groovy/tck/TestGeneratorHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/styles/junit-frames.xsl b/src/tck/styles/junit-frames.xsl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/styles/junit-frames.xsl
rename to src/tck/styles/junit-frames.xsl
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s01/Unicode1.groovy b/src/tck/test/gls/ch03/s01/Unicode1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s01/Unicode1.groovy
rename to src/tck/test/gls/ch03/s01/Unicode1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s01/Unicode2.groovy b/src/tck/test/gls/ch03/s01/Unicode2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s01/Unicode2.groovy
rename to src/tck/test/gls/ch03/s01/Unicode2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy b/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy
rename to src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s02/Longest1.groovy b/src/tck/test/gls/ch03/s02/Longest1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s02/Longest1.groovy
rename to src/tck/test/gls/ch03/s02/Longest1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy b/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
rename to src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy b/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
rename to src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/src/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
rename to src/test-resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/META-INF/services/org.codehaus.groovy.source.Extensions b/src/test-resources/META-INF/services/org.codehaus.groovy.source.Extensions
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/META-INF/services/org.codehaus.groovy.source.Extensions
rename to src/test-resources/META-INF/services/org.codehaus.groovy.source.Extensions
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/grape/defaultGrapeConfig.xml b/src/test-resources/groovy/grape/defaultGrapeConfig.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/grape/defaultGrapeConfig.xml
rename to src/test-resources/groovy/grape/defaultGrapeConfig.xml
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/sc/MixedMode.groovy b/src/test-resources/groovy/transform/sc/MixedMode.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/sc/MixedMode.groovy
rename to src/test-resources/groovy/transform/sc/MixedMode.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/sc/MixedMode2.groovy b/src/test-resources/groovy/transform/sc/MixedMode2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/sc/MixedMode2.groovy
rename to src/test-resources/groovy/transform/sc/MixedMode2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/sc/MixedModeDynamicBuilder.groovy b/src/test-resources/groovy/transform/sc/MixedModeDynamicBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/sc/MixedModeDynamicBuilder.groovy
rename to src/test-resources/groovy/transform/sc/MixedModeDynamicBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/AmbiguousMethods.groovy b/src/test-resources/groovy/transform/stc/AmbiguousMethods.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/AmbiguousMethods.groovy
rename to src/test-resources/groovy/transform/stc/AmbiguousMethods.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/AnnotatedByTestExtension.groovy b/src/test-resources/groovy/transform/stc/AnnotatedByTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/AnnotatedByTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/AnnotatedByTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/ArgumentsTestingTestExtension.groovy b/src/test-resources/groovy/transform/stc/ArgumentsTestingTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/ArgumentsTestingTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/ArgumentsTestingTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/BeforeAfterClassTestExtension.groovy b/src/test-resources/groovy/transform/stc/BeforeAfterClassTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/BeforeAfterClassTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/BeforeAfterClassTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/BinaryOperatorTestExtension.groovy b/src/test-resources/groovy/transform/stc/BinaryOperatorTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/BinaryOperatorTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/BinaryOperatorTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/DelegatesToTestExtension.groovy b/src/test-resources/groovy/transform/stc/DelegatesToTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/DelegatesToTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/DelegatesToTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/FinishTestExtension.groovy b/src/test-resources/groovy/transform/stc/FinishTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/FinishTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/FinishTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/FirstArgumentsTestingTestExtension.groovy b/src/test-resources/groovy/transform/stc/FirstArgumentsTestingTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/FirstArgumentsTestingTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/FirstArgumentsTestingTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/Groovy6047Extension.groovy b/src/test-resources/groovy/transform/stc/Groovy6047Extension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/Groovy6047Extension.groovy
rename to src/test-resources/groovy/transform/stc/Groovy6047Extension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/IncompatibleAssignmentTestExtension.groovy b/src/test-resources/groovy/transform/stc/IncompatibleAssignmentTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/IncompatibleAssignmentTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/IncompatibleAssignmentTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/IncompatibleReturnTypeTestExtension.groovy b/src/test-resources/groovy/transform/stc/IncompatibleReturnTypeTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/IncompatibleReturnTypeTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/IncompatibleReturnTypeTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/MissingMethod1TestExtension.groovy b/src/test-resources/groovy/transform/stc/MissingMethod1TestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/MissingMethod1TestExtension.groovy
rename to src/test-resources/groovy/transform/stc/MissingMethod1TestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/MissingMethod2TestExtension.groovy b/src/test-resources/groovy/transform/stc/MissingMethod2TestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/MissingMethod2TestExtension.groovy
rename to src/test-resources/groovy/transform/stc/MissingMethod2TestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/NewMethodAndIsGeneratedTestExtension.groovy b/src/test-resources/groovy/transform/stc/NewMethodAndIsGeneratedTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/NewMethodAndIsGeneratedTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/NewMethodAndIsGeneratedTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/NthArgumentTestingTestExtension.groovy b/src/test-resources/groovy/transform/stc/NthArgumentTestingTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/NthArgumentTestingTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/NthArgumentTestingTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/OnMethodSelectionTestExtension.groovy b/src/test-resources/groovy/transform/stc/OnMethodSelectionTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/OnMethodSelectionTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/OnMethodSelectionTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/PrefixChangerTestExtension.groovy b/src/test-resources/groovy/transform/stc/PrefixChangerTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/PrefixChangerTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/PrefixChangerTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/RobotMove.groovy b/src/test-resources/groovy/transform/stc/RobotMove.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/RobotMove.groovy
rename to src/test-resources/groovy/transform/stc/RobotMove.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/ScopeEnterExitTestExtension.groovy b/src/test-resources/groovy/transform/stc/ScopeEnterExitTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/ScopeEnterExitTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/ScopeEnterExitTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/SetupTestExtension.groovy b/src/test-resources/groovy/transform/stc/SetupTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/SetupTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/SetupTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/SilentTestExtension.groovy b/src/test-resources/groovy/transform/stc/SilentTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/SilentTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/SilentTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/SprintfExtension.groovy b/src/test-resources/groovy/transform/stc/SprintfExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/SprintfExtension.groovy
rename to src/test-resources/groovy/transform/stc/SprintfExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UndefinedVariableNoHandleTestExtension.groovy b/src/test-resources/groovy/transform/stc/UndefinedVariableNoHandleTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UndefinedVariableNoHandleTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/UndefinedVariableNoHandleTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UndefinedVariableTestExtension.groovy b/src/test-resources/groovy/transform/stc/UndefinedVariableTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UndefinedVariableTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/UndefinedVariableTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UnresolvedAttributeTestExtension.groovy b/src/test-resources/groovy/transform/stc/UnresolvedAttributeTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UnresolvedAttributeTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/UnresolvedAttributeTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UnresolvedPropertyTestExtension.groovy b/src/test-resources/groovy/transform/stc/UnresolvedPropertyTestExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UnresolvedPropertyTestExtension.groovy
rename to src/test-resources/groovy/transform/stc/UnresolvedPropertyTestExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UpperCaseMethodTest1Extension.groovy b/src/test-resources/groovy/transform/stc/UpperCaseMethodTest1Extension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UpperCaseMethodTest1Extension.groovy
rename to src/test-resources/groovy/transform/stc/UpperCaseMethodTest1Extension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UpperCaseMethodTest2Extension.groovy b/src/test-resources/groovy/transform/stc/UpperCaseMethodTest2Extension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UpperCaseMethodTest2Extension.groovy
rename to src/test-resources/groovy/transform/stc/UpperCaseMethodTest2Extension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UpperCaseMethodTest3Extension.groovy b/src/test-resources/groovy/transform/stc/UpperCaseMethodTest3Extension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/groovy/transform/stc/UpperCaseMethodTest3Extension.groovy
rename to src/test-resources/groovy/transform/stc/UpperCaseMethodTest3Extension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/circularLanguageReference/Rectangle.groovy b/src/test-resources/stubgenerator/circularLanguageReference/Rectangle.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/circularLanguageReference/Rectangle.groovy
rename to src/test-resources/stubgenerator/circularLanguageReference/Rectangle.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/circularLanguageReference/Shape.java b/src/test-resources/stubgenerator/circularLanguageReference/Shape.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/circularLanguageReference/Shape.java
rename to src/test-resources/stubgenerator/circularLanguageReference/Shape.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/circularLanguageReference/Square.java b/src/test-resources/stubgenerator/circularLanguageReference/Square.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/circularLanguageReference/Square.java
rename to src/test-resources/stubgenerator/circularLanguageReference/Square.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/GroovyPogo.groovy b/src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/GroovyPogo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/GroovyPogo.groovy
rename to src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/GroovyPogo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/JavaBean.java b/src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/JavaBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/JavaBean.java
rename to src/test-resources/stubgenerator/propertyUsageFromJava/somepackage/JavaBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/DefaultPackageClassSupport.java b/src/test/DefaultPackageClassSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/DefaultPackageClassSupport.java
rename to src/test/DefaultPackageClassSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/Outer3.groovy b/src/test/Outer3.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/Outer3.groovy
rename to src/test/Outer3.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/Outer4.groovy b/src/test/Outer4.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/Outer4.groovy
rename to src/test/Outer4.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/CompilableTestSupport.groovy b/src/test/gls/CompilableTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/CompilableTestSupport.groovy
rename to src/test/gls/CompilableTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/AnnotationTest.groovy b/src/test/gls/annotations/AnnotationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/AnnotationTest.groovy
rename to src/test/gls/annotations/AnnotationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/CascadeType.java b/src/test/gls/annotations/CascadeType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/CascadeType.java
rename to src/test/gls/annotations/CascadeType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/JavaAnnotation.java b/src/test/gls/annotations/JavaAnnotation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/JavaAnnotation.java
rename to src/test/gls/annotations/JavaAnnotation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/OneToMany.java b/src/test/gls/annotations/OneToMany.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/OneToMany.java
rename to src/test/gls/annotations/OneToMany.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/XmlEnum.groovy b/src/test/gls/annotations/XmlEnum.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/XmlEnum.groovy
rename to src/test/gls/annotations/XmlEnum.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/XmlEnumValue.groovy b/src/test/gls/annotations/XmlEnumValue.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/XmlEnumValue.groovy
rename to src/test/gls/annotations/XmlEnumValue.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy b/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityParameterizedTest.java b/src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityParameterizedTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityParameterizedTest.java
rename to src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityParameterizedTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityTest.java b/src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityTest.java
rename to src/test/gls/annotations/closures/AnnotationClosureJavaCompatibilityTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureOwnerCallTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureOwnerCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureOwnerCallTest.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureOwnerCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureThisObjectCallTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureThisObjectCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureThisObjectCallTest.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureThisObjectCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureUnqualifiedCallTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureUnqualifiedCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureUnqualifiedCallTest.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureUnqualifiedCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy b/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureWithParametersTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureWithParametersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/AnnotationClosureWithParametersTest.groovy
rename to src/test/gls/annotations/closures/AnnotationClosureWithParametersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaAnnotationWithClassElement.java b/src/test/gls/annotations/closures/JavaAnnotationWithClassElement.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaAnnotationWithClassElement.java
rename to src/test/gls/annotations/closures/JavaAnnotationWithClassElement.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaAnnotationWithClassElementParameterized.java b/src/test/gls/annotations/closures/JavaAnnotationWithClassElementParameterized.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaAnnotationWithClassElementParameterized.java
rename to src/test/gls/annotations/closures/JavaAnnotationWithClassElementParameterized.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaCompatibility.groovy b/src/test/gls/annotations/closures/JavaCompatibility.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaCompatibility.groovy
rename to src/test/gls/annotations/closures/JavaCompatibility.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaCompatibilityParameterized.groovy b/src/test/gls/annotations/closures/JavaCompatibilityParameterized.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/annotations/closures/JavaCompatibilityParameterized.groovy
rename to src/test/gls/annotations/closures/JavaCompatibilityParameterized.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/GName1Test.groovy b/src/test/gls/ch06/s05/GName1Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/GName1Test.groovy
rename to src/test/gls/ch06/s05/GName1Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/JName1Test.java b/src/test/gls/ch06/s05/JName1Test.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/JName1Test.java
rename to src/test/gls/ch06/s05/JName1Test.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1.java b/src/test/gls/ch06/s05/testClasses/Tt1.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1.java
rename to src/test/gls/ch06/s05/testClasses/Tt1.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1c.java b/src/test/gls/ch06/s05/testClasses/Tt1c.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1c.java
rename to src/test/gls/ch06/s05/testClasses/Tt1c.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1cgi.java b/src/test/gls/ch06/s05/testClasses/Tt1cgi.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1cgi.java
rename to src/test/gls/ch06/s05/testClasses/Tt1cgi.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1cgo.java b/src/test/gls/ch06/s05/testClasses/Tt1cgo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1cgo.java
rename to src/test/gls/ch06/s05/testClasses/Tt1cgo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1gi.java b/src/test/gls/ch06/s05/testClasses/Tt1gi.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1gi.java
rename to src/test/gls/ch06/s05/testClasses/Tt1gi.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1go.java b/src/test/gls/ch06/s05/testClasses/Tt1go.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch06/s05/testClasses/Tt1go.java
rename to src/test/gls/ch06/s05/testClasses/Tt1go.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch08/s04/FormalParameterTest.groovy b/src/test/gls/ch08/s04/FormalParameterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch08/s04/FormalParameterTest.groovy
rename to src/test/gls/ch08/s04/FormalParameterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/ch08/s04/RepetitiveMethodTest.groovy b/src/test/gls/ch08/s04/RepetitiveMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/ch08/s04/RepetitiveMethodTest.groovy
rename to src/test/gls/ch08/s04/RepetitiveMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/enums/EnumTest.groovy b/src/test/gls/enums/EnumTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/enums/EnumTest.groovy
rename to src/test/gls/enums/EnumTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/generics/GenericsTest.groovy b/src/test/gls/generics/GenericsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/generics/GenericsTest.groovy
rename to src/test/gls/generics/GenericsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/generics/GenericsTestBase.java b/src/test/gls/generics/GenericsTestBase.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/generics/GenericsTestBase.java
rename to src/test/gls/generics/GenericsTestBase.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/innerClass/InnerClassTest.groovy b/src/test/gls/innerClass/InnerClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/innerClass/InnerClassTest.groovy
rename to src/test/gls/innerClass/InnerClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/innerClass/InnerInterfaceTest.groovy b/src/test/gls/innerClass/InnerInterfaceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/innerClass/InnerInterfaceTest.groovy
rename to src/test/gls/innerClass/InnerInterfaceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/ClassDuplicationTest.groovy b/src/test/gls/invocation/ClassDuplicationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/ClassDuplicationTest.groovy
rename to src/test/gls/invocation/ClassDuplicationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/ClosureDelegationTest.groovy b/src/test/gls/invocation/ClosureDelegationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/ClosureDelegationTest.groovy
rename to src/test/gls/invocation/ClosureDelegationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/ConstructorDelegationTest.groovy b/src/test/gls/invocation/ConstructorDelegationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/ConstructorDelegationTest.groovy
rename to src/test/gls/invocation/ConstructorDelegationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/CovariantReturnTest.groovy b/src/test/gls/invocation/CovariantReturnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/CovariantReturnTest.groovy
rename to src/test/gls/invocation/CovariantReturnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/DefaultParamTest.groovy b/src/test/gls/invocation/DefaultParamTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/DefaultParamTest.groovy
rename to src/test/gls/invocation/DefaultParamTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy b/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/GroovyObjectInheritanceTest.groovy
rename to src/test/gls/invocation/GroovyObjectInheritanceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/MethodDeclarationTest.groovy b/src/test/gls/invocation/MethodDeclarationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/MethodDeclarationTest.groovy
rename to src/test/gls/invocation/MethodDeclarationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/MethodSelectionTest.groovy b/src/test/gls/invocation/MethodSelectionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/MethodSelectionTest.groovy
rename to src/test/gls/invocation/MethodSelectionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/invocation/StaticMethodInvocationTest.groovy b/src/test/gls/invocation/StaticMethodInvocationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/invocation/StaticMethodInvocationTest.groovy
rename to src/test/gls/invocation/StaticMethodInvocationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/property/MetaClassOverridingTest.groovy b/src/test/gls/property/MetaClassOverridingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/property/MetaClassOverridingTest.groovy
rename to src/test/gls/property/MetaClassOverridingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/BlockScopeVisibilityTest.groovy b/src/test/gls/scope/BlockScopeVisibilityTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/BlockScopeVisibilityTest.groovy
rename to src/test/gls/scope/BlockScopeVisibilityTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/ClassVariableHidingTest.groovy b/src/test/gls/scope/ClassVariableHidingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/ClassVariableHidingTest.groovy
rename to src/test/gls/scope/ClassVariableHidingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/FinalAccessTest.groovy b/src/test/gls/scope/FinalAccessTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/FinalAccessTest.groovy
rename to src/test/gls/scope/FinalAccessTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/MultipleDefinitionOfSameVariableTest.groovy b/src/test/gls/scope/MultipleDefinitionOfSameVariableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/MultipleDefinitionOfSameVariableTest.groovy
rename to src/test/gls/scope/MultipleDefinitionOfSameVariableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/NameResolvingTest.groovy b/src/test/gls/scope/NameResolvingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/NameResolvingTest.groovy
rename to src/test/gls/scope/NameResolvingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/StaticScopeTest.groovy b/src/test/gls/scope/StaticScopeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/StaticScopeTest.groovy
rename to src/test/gls/scope/StaticScopeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/scope/VariablePrecedenceTest.groovy b/src/test/gls/scope/VariablePrecedenceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/scope/VariablePrecedenceTest.groovy
rename to src/test/gls/scope/VariablePrecedenceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/sizelimits/StringSizeTest.groovy b/src/test/gls/sizelimits/StringSizeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/sizelimits/StringSizeTest.groovy
rename to src/test/gls/sizelimits/StringSizeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/statements/DeclarationTest.groovy b/src/test/gls/statements/DeclarationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/statements/DeclarationTest.groovy
rename to src/test/gls/statements/DeclarationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy b/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy
rename to src/test/gls/statements/MultipleAssignmentDeclarationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/statements/MultipleAssignmentTest.groovy b/src/test/gls/statements/MultipleAssignmentTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/statements/MultipleAssignmentTest.groovy
rename to src/test/gls/statements/MultipleAssignmentTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/statements/ReturnTest.groovy b/src/test/gls/statements/ReturnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/statements/ReturnTest.groovy
rename to src/test/gls/statements/ReturnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/AssertTest.groovy b/src/test/gls/syntax/AssertTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/AssertTest.groovy
rename to src/test/gls/syntax/AssertTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/BinaryLiteralTest.groovy b/src/test/gls/syntax/BinaryLiteralTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/BinaryLiteralTest.groovy
rename to src/test/gls/syntax/BinaryLiteralTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/Gep3OrderDslTest.groovy b/src/test/gls/syntax/Gep3OrderDslTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/Gep3OrderDslTest.groovy
rename to src/test/gls/syntax/Gep3OrderDslTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/Gep3Test.groovy b/src/test/gls/syntax/Gep3Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/Gep3Test.groovy
rename to src/test/gls/syntax/Gep3Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/MethodCallValidationTest.groovy b/src/test/gls/syntax/MethodCallValidationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/MethodCallValidationTest.groovy
rename to src/test/gls/syntax/MethodCallValidationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/NumberLiteralTest.groovy b/src/test/gls/syntax/NumberLiteralTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/NumberLiteralTest.groovy
rename to src/test/gls/syntax/NumberLiteralTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/OldClosureSyntaxRemovalTest.groovy b/src/test/gls/syntax/OldClosureSyntaxRemovalTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/OldClosureSyntaxRemovalTest.groovy
rename to src/test/gls/syntax/OldClosureSyntaxRemovalTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/OldPropertySyntaxRemovalTest.groovy b/src/test/gls/syntax/OldPropertySyntaxRemovalTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/OldPropertySyntaxRemovalTest.groovy
rename to src/test/gls/syntax/OldPropertySyntaxRemovalTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/OldSpreadTest.groovy b/src/test/gls/syntax/OldSpreadTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/OldSpreadTest.groovy
rename to src/test/gls/syntax/OldSpreadTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/ParsingTest.groovy b/src/test/gls/syntax/ParsingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/ParsingTest.groovy
rename to src/test/gls/syntax/ParsingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/syntax/UnderscoreInNumbersTest.groovy b/src/test/gls/syntax/UnderscoreInNumbersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/syntax/UnderscoreInNumbersTest.groovy
rename to src/test/gls/syntax/UnderscoreInNumbersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/types/BooleanExpressionConversionTest.groovy b/src/test/gls/types/BooleanExpressionConversionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/types/BooleanExpressionConversionTest.groovy
rename to src/test/gls/types/BooleanExpressionConversionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/types/GroovyCastTest.groovy b/src/test/gls/types/GroovyCastTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/types/GroovyCastTest.groovy
rename to src/test/gls/types/GroovyCastTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/gls/types/OperationsResultTypeTest.groovy b/src/test/gls/types/OperationsResultTypeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/gls/types/OperationsResultTypeTest.groovy
rename to src/test/gls/types/OperationsResultTypeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/AbstractClassAndInterfaceTest.groovy b/src/test/groovy/AbstractClassAndInterfaceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/AbstractClassAndInterfaceTest.groovy
rename to src/test/groovy/AbstractClassAndInterfaceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ActorTest.groovy b/src/test/groovy/ActorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ActorTest.groovy
rename to src/test/groovy/ActorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/AmbiguousInvocationTest.groovy b/src/test/groovy/AmbiguousInvocationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/AmbiguousInvocationTest.groovy
rename to src/test/groovy/AmbiguousInvocationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayAutoboxingTest.groovy b/src/test/groovy/ArrayAutoboxingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayAutoboxingTest.groovy
rename to src/test/groovy/ArrayAutoboxingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayCoerceTest.groovy b/src/test/groovy/ArrayCoerceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayCoerceTest.groovy
rename to src/test/groovy/ArrayCoerceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayParamMethodTest.groovy b/src/test/groovy/ArrayParamMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayParamMethodTest.groovy
rename to src/test/groovy/ArrayParamMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayTest.groovy b/src/test/groovy/ArrayTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayTest.groovy
rename to src/test/groovy/ArrayTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayTypeTest.groovy b/src/test/groovy/ArrayTypeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ArrayTypeTest.groovy
rename to src/test/groovy/ArrayTypeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/AsTest.groovy b/src/test/groovy/AsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/AsTest.groovy
rename to src/test/groovy/AsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/AssertNumberTest.groovy b/src/test/groovy/AssertNumberTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/AssertNumberTest.groovy
rename to src/test/groovy/AssertNumberTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/AssertTest.groovy b/src/test/groovy/AssertTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/AssertTest.groovy
rename to src/test/groovy/AssertTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/Bar.groovy b/src/test/groovy/Bar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/Bar.groovy
rename to src/test/groovy/Bar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/Base64Test.groovy b/src/test/groovy/Base64Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/Base64Test.groovy
rename to src/test/groovy/Base64Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/BinaryStreamsTest.groovy b/src/test/groovy/BinaryStreamsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/BinaryStreamsTest.groovy
rename to src/test/groovy/BinaryStreamsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/BindingTest.groovy b/src/test/groovy/BindingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/BindingTest.groovy
rename to src/test/groovy/BindingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/BitSetTest.groovy b/src/test/groovy/BitSetTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/BitSetTest.groovy
rename to src/test/groovy/BitSetTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/BreakContinueLabelTest.groovy b/src/test/groovy/BreakContinueLabelTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/BreakContinueLabelTest.groovy
rename to src/test/groovy/BreakContinueLabelTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CallInnerClassCtorTest.groovy b/src/test/groovy/CallInnerClassCtorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CallInnerClassCtorTest.groovy
rename to src/test/groovy/CallInnerClassCtorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CastTest.groovy b/src/test/groovy/CastTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CastTest.groovy
rename to src/test/groovy/CastTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CategoryTest.groovy b/src/test/groovy/CategoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CategoryTest.groovy
rename to src/test/groovy/CategoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ChainedAssignmentTest.groovy b/src/test/groovy/ChainedAssignmentTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ChainedAssignmentTest.groovy
rename to src/test/groovy/ChainedAssignmentTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClassExpressionTest.groovy b/src/test/groovy/ClassExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClassExpressionTest.groovy
rename to src/test/groovy/ClassExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClassLoaderBug.groovy b/src/test/groovy/ClassLoaderBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClassLoaderBug.groovy
rename to src/test/groovy/ClassLoaderBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClassTest.groovy b/src/test/groovy/ClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClassTest.groovy
rename to src/test/groovy/ClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureAsParamTest.groovy b/src/test/groovy/ClosureAsParamTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureAsParamTest.groovy
rename to src/test/groovy/ClosureAsParamTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureCloneTest.groovy b/src/test/groovy/ClosureCloneTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureCloneTest.groovy
rename to src/test/groovy/ClosureCloneTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureComparatorTest.groovy b/src/test/groovy/ClosureComparatorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureComparatorTest.groovy
rename to src/test/groovy/ClosureComparatorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureComposeTest.groovy b/src/test/groovy/ClosureComposeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureComposeTest.groovy
rename to src/test/groovy/ClosureComposeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureCurryTest.groovy b/src/test/groovy/ClosureCurryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureCurryTest.groovy
rename to src/test/groovy/ClosureCurryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureDefaultParameterTest.groovy b/src/test/groovy/ClosureDefaultParameterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureDefaultParameterTest.groovy
rename to src/test/groovy/ClosureDefaultParameterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureInClosureTest.groovy b/src/test/groovy/ClosureInClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureInClosureTest.groovy
rename to src/test/groovy/ClosureInClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureInStaticMethodTest.groovy b/src/test/groovy/ClosureInStaticMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureInStaticMethodTest.groovy
rename to src/test/groovy/ClosureInStaticMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureJavaIntegrationTest.java b/src/test/groovy/ClosureJavaIntegrationTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureJavaIntegrationTest.java
rename to src/test/groovy/ClosureJavaIntegrationTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMethodCallTest.groovy b/src/test/groovy/ClosureMethodCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMethodCallTest.groovy
rename to src/test/groovy/ClosureMethodCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMethodTest.groovy b/src/test/groovy/ClosureMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMethodTest.groovy
rename to src/test/groovy/ClosureMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMethodsOnFileTest.groovy b/src/test/groovy/ClosureMethodsOnFileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMethodsOnFileTest.groovy
rename to src/test/groovy/ClosureMethodsOnFileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMissingMethodTest.groovy b/src/test/groovy/ClosureMissingMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureMissingMethodTest.groovy
rename to src/test/groovy/ClosureMissingMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureReturnTest.groovy b/src/test/groovy/ClosureReturnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureReturnTest.groovy
rename to src/test/groovy/ClosureReturnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy b/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
rename to src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureSugarTest.groovy b/src/test/groovy/ClosureSugarTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureSugarTest.groovy
rename to src/test/groovy/ClosureSugarTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureTest.groovy b/src/test/groovy/ClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureTest.groovy
rename to src/test/groovy/ClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureUsingOuterVariablesTest.groovy b/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
rename to src/test/groovy/ClosureUsingOuterVariablesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureWithDefaultParamTest.groovy b/src/test/groovy/ClosureWithDefaultParamTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureWithDefaultParamTest.groovy
rename to src/test/groovy/ClosureWithDefaultParamTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureWithEmptyParametersTest.groovy b/src/test/groovy/ClosureWithEmptyParametersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ClosureWithEmptyParametersTest.groovy
rename to src/test/groovy/ClosureWithEmptyParametersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CollateTest.groovy b/src/test/groovy/CollateTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CollateTest.groovy
rename to src/test/groovy/CollateTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CompareEqualsTest.groovy b/src/test/groovy/CompareEqualsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CompareEqualsTest.groovy
rename to src/test/groovy/CompareEqualsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CompareToTest.groovy b/src/test/groovy/CompareToTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CompareToTest.groovy
rename to src/test/groovy/CompareToTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CompareTypesTest.groovy b/src/test/groovy/CompareTypesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CompareTypesTest.groovy
rename to src/test/groovy/CompareTypesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CompileOrderTest.groovy b/src/test/groovy/CompileOrderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CompileOrderTest.groovy
rename to src/test/groovy/CompileOrderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CompilerErrorTest.groovy b/src/test/groovy/CompilerErrorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CompilerErrorTest.groovy
rename to src/test/groovy/CompilerErrorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/Constructor2Test.groovy b/src/test/groovy/Constructor2Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/Constructor2Test.groovy
rename to src/test/groovy/Constructor2Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ConstructorTest.groovy b/src/test/groovy/ConstructorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ConstructorTest.groovy
rename to src/test/groovy/ConstructorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/CurlyBracketLayoutTest.groovy b/src/test/groovy/CurlyBracketLayoutTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/CurlyBracketLayoutTest.groovy
rename to src/test/groovy/CurlyBracketLayoutTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DateTest.groovy b/src/test/groovy/DateTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DateTest.groovy
rename to src/test/groovy/DateTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DefaultParamClosureTest.groovy b/src/test/groovy/DefaultParamClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DefaultParamClosureTest.groovy
rename to src/test/groovy/DefaultParamClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DoWhileLoopTest.groovy b/src/test/groovy/DoWhileLoopTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DoWhileLoopTest.groovy
rename to src/test/groovy/DoWhileLoopTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DollarEscapingTest.groovy b/src/test/groovy/DollarEscapingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DollarEscapingTest.groovy
rename to src/test/groovy/DollarEscapingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DownUpStepTest.groovy b/src/test/groovy/DownUpStepTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DownUpStepTest.groovy
rename to src/test/groovy/DownUpStepTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DummyInterface.java b/src/test/groovy/DummyInterface.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DummyInterface.java
rename to src/test/groovy/DummyInterface.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DummyMethodsGroovy.groovy b/src/test/groovy/DummyMethodsGroovy.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DummyMethodsGroovy.groovy
rename to src/test/groovy/DummyMethodsGroovy.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DummyMethodsJava.java b/src/test/groovy/DummyMethodsJava.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DummyMethodsJava.java
rename to src/test/groovy/DummyMethodsJava.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/DynamicMemberTest.groovy b/src/test/groovy/DynamicMemberTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/DynamicMemberTest.groovy
rename to src/test/groovy/DynamicMemberTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/EqualsTest.groovy b/src/test/groovy/EqualsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/EqualsTest.groovy
rename to src/test/groovy/EqualsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/EscapedUnicodeTest.groovy b/src/test/groovy/EscapedUnicodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/EscapedUnicodeTest.groovy
rename to src/test/groovy/EscapedUnicodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ExceptionInClosureTest.groovy b/src/test/groovy/ExceptionInClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ExceptionInClosureTest.groovy
rename to src/test/groovy/ExceptionInClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ExpandoPropertyTest.groovy b/src/test/groovy/ExpandoPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ExpandoPropertyTest.groovy
rename to src/test/groovy/ExpandoPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/FileTest.groovy b/src/test/groovy/FileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/FileTest.groovy
rename to src/test/groovy/FileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/FilterLineTest.groovy b/src/test/groovy/FilterLineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/FilterLineTest.groovy
rename to src/test/groovy/FilterLineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/FinallyTest.groovy b/src/test/groovy/FinallyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/FinallyTest.groovy
rename to src/test/groovy/FinallyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/Foo.groovy b/src/test/groovy/Foo.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/Foo.groovy
rename to src/test/groovy/Foo.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ForLoopTest.groovy b/src/test/groovy/ForLoopTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ForLoopTest.groovy
rename to src/test/groovy/ForLoopTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ForLoopWithLocalVariablesTest.groovy b/src/test/groovy/ForLoopWithLocalVariablesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ForLoopWithLocalVariablesTest.groovy
rename to src/test/groovy/ForLoopWithLocalVariablesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GStringTest.groovy b/src/test/groovy/GStringTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GStringTest.groovy
rename to src/test/groovy/GStringTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GeneratorTest.groovy b/src/test/groovy/GeneratorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GeneratorTest.groovy
rename to src/test/groovy/GeneratorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GlobalPrintlnTest.groovy b/src/test/groovy/GlobalPrintlnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GlobalPrintlnTest.groovy
rename to src/test/groovy/GlobalPrintlnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyCharSequenceMethodsTest.groovy b/src/test/groovy/GroovyCharSequenceMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyCharSequenceMethodsTest.groovy
rename to src/test/groovy/GroovyCharSequenceMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyClosureMethodsTest.groovy b/src/test/groovy/GroovyClosureMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyClosureMethodsTest.groovy
rename to src/test/groovy/GroovyClosureMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyInterceptableTest.groovy b/src/test/groovy/GroovyInterceptableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyInterceptableTest.groovy
rename to src/test/groovy/GroovyInterceptableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyMethodsTest.groovy b/src/test/groovy/GroovyMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyMethodsTest.groovy
rename to src/test/groovy/GroovyMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyTruthTest.groovy b/src/test/groovy/GroovyTruthTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/GroovyTruthTest.groovy
rename to src/test/groovy/GroovyTruthTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/HeredocsTest.groovy b/src/test/groovy/HeredocsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/HeredocsTest.groovy
rename to src/test/groovy/HeredocsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/HexTest.groovy b/src/test/groovy/HexTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/HexTest.groovy
rename to src/test/groovy/HexTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/HomepageTest.groovy b/src/test/groovy/HomepageTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/HomepageTest.groovy
rename to src/test/groovy/HomepageTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/IdentityClosureTest.groovy b/src/test/groovy/IdentityClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/IdentityClosureTest.groovy
rename to src/test/groovy/IdentityClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/IfElseCompactTest.groovy b/src/test/groovy/IfElseCompactTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/IfElseCompactTest.groovy
rename to src/test/groovy/IfElseCompactTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/IfElseTest.groovy b/src/test/groovy/IfElseTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/IfElseTest.groovy
rename to src/test/groovy/IfElseTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/IfPropertyTest.groovy b/src/test/groovy/IfPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/IfPropertyTest.groovy
rename to src/test/groovy/IfPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/IfTest.groovy b/src/test/groovy/IfTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/IfTest.groovy
rename to src/test/groovy/IfTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/IfWithMethodCallTest.groovy b/src/test/groovy/IfWithMethodCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/IfWithMethodCallTest.groovy
rename to src/test/groovy/IfWithMethodCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ImmutableModificationTest.groovy b/src/test/groovy/ImmutableModificationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ImmutableModificationTest.groovy
rename to src/test/groovy/ImmutableModificationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ImportTest.groovy b/src/test/groovy/ImportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ImportTest.groovy
rename to src/test/groovy/ImportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/InstanceofTest.groovy b/src/test/groovy/InstanceofTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/InstanceofTest.groovy
rename to src/test/groovy/InstanceofTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/InterfaceTest.groovy b/src/test/groovy/InterfaceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/InterfaceTest.groovy
rename to src/test/groovy/InterfaceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/InvokeNormalMethodsFirstTest.groovy b/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
rename to src/test/groovy/InvokeNormalMethodsFirstTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/JavaClass.java b/src/test/groovy/JavaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/JavaClass.java
rename to src/test/groovy/JavaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/JointGroovy.groovy b/src/test/groovy/JointGroovy.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/JointGroovy.groovy
rename to src/test/groovy/JointGroovy.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/JointJava.java b/src/test/groovy/JointJava.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/JointJava.java
rename to src/test/groovy/JointJava.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/KeywordsInPropertyNamesTest.groovy b/src/test/groovy/KeywordsInPropertyNamesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/KeywordsInPropertyNamesTest.groovy
rename to src/test/groovy/KeywordsInPropertyNamesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/Language.java b/src/test/groovy/Language.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/Language.java
rename to src/test/groovy/Language.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LeftShiftTest.groovy b/src/test/groovy/LeftShiftTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LeftShiftTest.groovy
rename to src/test/groovy/LeftShiftTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ListIteratingTest.groovy b/src/test/groovy/ListIteratingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ListIteratingTest.groovy
rename to src/test/groovy/ListIteratingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ListTest.groovy b/src/test/groovy/ListTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ListTest.groovy
rename to src/test/groovy/ListTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LiteralTypesTest.groovy b/src/test/groovy/LiteralTypesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LiteralTypesTest.groovy
rename to src/test/groovy/LiteralTypesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LittleClosureTest.groovy b/src/test/groovy/LittleClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LittleClosureTest.groovy
rename to src/test/groovy/LittleClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LocalFieldTest.groovy b/src/test/groovy/LocalFieldTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LocalFieldTest.groovy
rename to src/test/groovy/LocalFieldTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LocalPropertyTest.groovy b/src/test/groovy/LocalPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LocalPropertyTest.groovy
rename to src/test/groovy/LocalPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LocalVariableTest.groovy b/src/test/groovy/LocalVariableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LocalVariableTest.groovy
rename to src/test/groovy/LocalVariableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LogicTest.groovy b/src/test/groovy/LogicTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LogicTest.groovy
rename to src/test/groovy/LogicTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/LoopBreakTest.groovy b/src/test/groovy/LoopBreakTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/LoopBreakTest.groovy
rename to src/test/groovy/LoopBreakTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MapConstructionTest.groovy b/src/test/groovy/MapConstructionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MapConstructionTest.groovy
rename to src/test/groovy/MapConstructionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MapPropertyTest.groovy b/src/test/groovy/MapPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MapPropertyTest.groovy
rename to src/test/groovy/MapPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MapTest.groovy b/src/test/groovy/MapTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MapTest.groovy
rename to src/test/groovy/MapTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MethodCallTest.groovy b/src/test/groovy/MethodCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MethodCallTest.groovy
rename to src/test/groovy/MethodCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MethodCallWithoutParenthesisTest.groovy b/src/test/groovy/MethodCallWithoutParenthesisTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MethodCallWithoutParenthesisTest.groovy
rename to src/test/groovy/MethodCallWithoutParenthesisTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MethodInBadPositionTest.groovy b/src/test/groovy/MethodInBadPositionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MethodInBadPositionTest.groovy
rename to src/test/groovy/MethodInBadPositionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy b/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
rename to src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MinMaxTest.groovy b/src/test/groovy/MinMaxTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MinMaxTest.groovy
rename to src/test/groovy/MinMaxTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MinusEqualsTest.groovy b/src/test/groovy/MinusEqualsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MinusEqualsTest.groovy
rename to src/test/groovy/MinusEqualsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ModifiersTest.groovy b/src/test/groovy/ModifiersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ModifiersTest.groovy
rename to src/test/groovy/ModifiersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ModuloTest.groovy b/src/test/groovy/ModuloTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ModuloTest.groovy
rename to src/test/groovy/ModuloTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MultiCatchTest.groovy b/src/test/groovy/MultiCatchTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MultiCatchTest.groovy
rename to src/test/groovy/MultiCatchTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MultiDimArraysTest.groovy b/src/test/groovy/MultiDimArraysTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MultiDimArraysTest.groovy
rename to src/test/groovy/MultiDimArraysTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MultilineChainExpressionTest.groovy b/src/test/groovy/MultilineChainExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MultilineChainExpressionTest.groovy
rename to src/test/groovy/MultilineChainExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MultilineStringTest.groovy b/src/test/groovy/MultilineStringTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MultilineStringTest.groovy
rename to src/test/groovy/MultilineStringTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/MultiplyDivideEqualsTest.groovy b/src/test/groovy/MultiplyDivideEqualsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/MultiplyDivideEqualsTest.groovy
rename to src/test/groovy/MultiplyDivideEqualsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/NamedParameterTest.groovy b/src/test/groovy/NamedParameterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/NamedParameterTest.groovy
rename to src/test/groovy/NamedParameterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/NestedClassTest.groovy b/src/test/groovy/NestedClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/NestedClassTest.groovy
rename to src/test/groovy/NestedClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/NewExpressionTest.groovy b/src/test/groovy/NewExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/NewExpressionTest.groovy
rename to src/test/groovy/NewExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/NoPackageTest.groovy b/src/test/groovy/NoPackageTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/NoPackageTest.groovy
rename to src/test/groovy/NoPackageTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/NullPropertyTest.groovy b/src/test/groovy/NullPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/NullPropertyTest.groovy
rename to src/test/groovy/NullPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/NumberMathTest.groovy b/src/test/groovy/NumberMathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/NumberMathTest.groovy
rename to src/test/groovy/NumberMathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/OptionalReturnTest.groovy b/src/test/groovy/OptionalReturnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/OptionalReturnTest.groovy
rename to src/test/groovy/OptionalReturnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/OuterUser.java b/src/test/groovy/OuterUser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/OuterUser.java
rename to src/test/groovy/OuterUser.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/OverloadInvokeMethodTest.groovy b/src/test/groovy/OverloadInvokeMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/OverloadInvokeMethodTest.groovy
rename to src/test/groovy/OverloadInvokeMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/OverridePropertyGetterTest.groovy b/src/test/groovy/OverridePropertyGetterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/OverridePropertyGetterTest.groovy
rename to src/test/groovy/OverridePropertyGetterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/OverrideTest.groovy b/src/test/groovy/OverrideTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/OverrideTest.groovy
rename to src/test/groovy/OverrideTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PlusEqualsTest.groovy b/src/test/groovy/PlusEqualsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PlusEqualsTest.groovy
rename to src/test/groovy/PlusEqualsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PostfixTest.groovy b/src/test/groovy/PostfixTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PostfixTest.groovy
rename to src/test/groovy/PostfixTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrefixTest.groovy b/src/test/groovy/PrefixTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrefixTest.groovy
rename to src/test/groovy/PrefixTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveArraysTest.groovy b/src/test/groovy/PrimitiveArraysTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveArraysTest.groovy
rename to src/test/groovy/PrimitiveArraysTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveDefaultValueTest.groovy b/src/test/groovy/PrimitiveDefaultValueTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveDefaultValueTest.groovy
rename to src/test/groovy/PrimitiveDefaultValueTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveTypeFieldTest.groovy b/src/test/groovy/PrimitiveTypeFieldTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveTypeFieldTest.groovy
rename to src/test/groovy/PrimitiveTypeFieldTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveTypesTest.groovy b/src/test/groovy/PrimitiveTypesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrimitiveTypesTest.groovy
rename to src/test/groovy/PrimitiveTypesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrintTest.groovy b/src/test/groovy/PrintTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrintTest.groovy
rename to src/test/groovy/PrintTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy b/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
rename to src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ProcessTest.groovy b/src/test/groovy/ProcessTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ProcessTest.groovy
rename to src/test/groovy/ProcessTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/Property2Test.groovy b/src/test/groovy/Property2Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/Property2Test.groovy
rename to src/test/groovy/Property2Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PropertyTest.groovy b/src/test/groovy/PropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PropertyTest.groovy
rename to src/test/groovy/PropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/PropertyWithoutDotTest.groovy b/src/test/groovy/PropertyWithoutDotTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/PropertyWithoutDotTest.groovy
rename to src/test/groovy/PropertyWithoutDotTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/RangeTest.groovy b/src/test/groovy/RangeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/RangeTest.groovy
rename to src/test/groovy/RangeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ReadLineTest.groovy b/src/test/groovy/ReadLineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ReadLineTest.groovy
rename to src/test/groovy/ReadLineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/RegularExpressionsTest.groovy b/src/test/groovy/RegularExpressionsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/RegularExpressionsTest.groovy
rename to src/test/groovy/RegularExpressionsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ReturnTest.groovy b/src/test/groovy/ReturnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ReturnTest.groovy
rename to src/test/groovy/ReturnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SafeNavigationTest.groovy b/src/test/groovy/SafeNavigationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SafeNavigationTest.groovy
rename to src/test/groovy/SafeNavigationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SampleMain.groovy b/src/test/groovy/SampleMain.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SampleMain.groovy
rename to src/test/groovy/SampleMain.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SerializeTest.groovy b/src/test/groovy/SerializeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SerializeTest.groovy
rename to src/test/groovy/SerializeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SetTest.groovy b/src/test/groovy/SetTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SetTest.groovy
rename to src/test/groovy/SetTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ShellTest.groovy b/src/test/groovy/ShellTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ShellTest.groovy
rename to src/test/groovy/ShellTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SimplePostfixTest.groovy b/src/test/groovy/SimplePostfixTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SimplePostfixTest.groovy
rename to src/test/groovy/SimplePostfixTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SingletonBugTest.groovy b/src/test/groovy/SingletonBugTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SingletonBugTest.groovy
rename to src/test/groovy/SingletonBugTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SliceTest.groovy b/src/test/groovy/SliceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SliceTest.groovy
rename to src/test/groovy/SliceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SocketTest.groovy b/src/test/groovy/SocketTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SocketTest.groovy
rename to src/test/groovy/SocketTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SomeClass.java b/src/test/groovy/SomeClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SomeClass.java
rename to src/test/groovy/SomeClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SortTest.groovy b/src/test/groovy/SortTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SortTest.groovy
rename to src/test/groovy/SortTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SpreadDotTest.groovy b/src/test/groovy/SpreadDotTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SpreadDotTest.groovy
rename to src/test/groovy/SpreadDotTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SqlDateTest.groovy b/src/test/groovy/SqlDateTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SqlDateTest.groovy
rename to src/test/groovy/SqlDateTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StackTraceTest.groovy b/src/test/groovy/StackTraceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StackTraceTest.groovy
rename to src/test/groovy/StackTraceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StaticImportTarget.groovy b/src/test/groovy/StaticImportTarget.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StaticImportTarget.groovy
rename to src/test/groovy/StaticImportTarget.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StaticImportTest.groovy b/src/test/groovy/StaticImportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StaticImportTest.groovy
rename to src/test/groovy/StaticImportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StaticMessageTest.groovy b/src/test/groovy/StaticMessageTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StaticMessageTest.groovy
rename to src/test/groovy/StaticMessageTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StaticThisTest.groovy b/src/test/groovy/StaticThisTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StaticThisTest.groovy
rename to src/test/groovy/StaticThisTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StringBufferTest.groovy b/src/test/groovy/StringBufferTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StringBufferTest.groovy
rename to src/test/groovy/StringBufferTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/StringTest.groovy b/src/test/groovy/StringTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/StringTest.groovy
rename to src/test/groovy/StringTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SubscriptTest.groovy b/src/test/groovy/SubscriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SubscriptTest.groovy
rename to src/test/groovy/SubscriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SwitchTest.groovy b/src/test/groovy/SwitchTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SwitchTest.groovy
rename to src/test/groovy/SwitchTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/SwitchWithDifferentTypesTest.groovy b/src/test/groovy/SwitchWithDifferentTypesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/SwitchWithDifferentTypesTest.groovy
rename to src/test/groovy/SwitchWithDifferentTypesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/TestInterruptor.java b/src/test/groovy/TestInterruptor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/TestInterruptor.java
rename to src/test/groovy/TestInterruptor.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/TextPropertyTest.groovy b/src/test/groovy/TextPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/TextPropertyTest.groovy
rename to src/test/groovy/TextPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ThisAndSuperTest.groovy b/src/test/groovy/ThisAndSuperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ThisAndSuperTest.groovy
rename to src/test/groovy/ThisAndSuperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ThreadMethodsTest.groovy b/src/test/groovy/ThreadMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ThreadMethodsTest.groovy
rename to src/test/groovy/ThreadMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ThrowTest.groovy b/src/test/groovy/ThrowTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ThrowTest.groovy
rename to src/test/groovy/ThrowTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ToArrayBugTest.groovy b/src/test/groovy/ToArrayBugTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ToArrayBugTest.groovy
rename to src/test/groovy/ToArrayBugTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/TripleQuotedStringTest.groovy b/src/test/groovy/TripleQuotedStringTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/TripleQuotedStringTest.groovy
rename to src/test/groovy/TripleQuotedStringTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/TryCatchTest.groovy b/src/test/groovy/TryCatchTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/TryCatchTest.groovy
rename to src/test/groovy/TryCatchTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/TypesafeMethodTest.groovy b/src/test/groovy/TypesafeMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/TypesafeMethodTest.groovy
rename to src/test/groovy/TypesafeMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/UniqueOnCollectionTest.groovy b/src/test/groovy/UniqueOnCollectionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/UniqueOnCollectionTest.groovy
rename to src/test/groovy/UniqueOnCollectionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy b/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
rename to src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy b/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
rename to src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/UnitTestAsScriptTest.groovy b/src/test/groovy/UnitTestAsScriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/UnitTestAsScriptTest.groovy
rename to src/test/groovy/UnitTestAsScriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/UnsafeNavigationTest.groovy b/src/test/groovy/UnsafeNavigationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/UnsafeNavigationTest.groovy
rename to src/test/groovy/UnsafeNavigationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/VArgsTest.groovy b/src/test/groovy/VArgsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/VArgsTest.groovy
rename to src/test/groovy/VArgsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ValidNameTest.groovy b/src/test/groovy/ValidNameTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ValidNameTest.groovy
rename to src/test/groovy/ValidNameTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/VarargsMethodTest.groovy b/src/test/groovy/VarargsMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/VarargsMethodTest.groovy
rename to src/test/groovy/VarargsMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/VerbatimGStringTest.groovy b/src/test/groovy/VerbatimGStringTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/VerbatimGStringTest.groovy
rename to src/test/groovy/VerbatimGStringTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/WhileLoopTest.groovy b/src/test/groovy/WhileLoopTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/WhileLoopTest.groovy
rename to src/test/groovy/WhileLoopTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/MyClass.groovy b/src/test/groovy/annotations/MyClass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/MyClass.groovy
rename to src/test/groovy/annotations/MyClass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/MyIntegerAnno.groovy b/src/test/groovy/annotations/MyIntegerAnno.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/MyIntegerAnno.groovy
rename to src/test/groovy/annotations/MyIntegerAnno.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/MyIntegerAnnoTraceASTTransformation.java b/src/test/groovy/annotations/MyIntegerAnnoTraceASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/MyIntegerAnnoTraceASTTransformation.java
rename to src/test/groovy/annotations/MyIntegerAnnoTraceASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy b/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy
rename to src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/ParameterAnnotationTest.groovy b/src/test/groovy/annotations/ParameterAnnotationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/ParameterAnnotationTest.groovy
rename to src/test/groovy/annotations/ParameterAnnotationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/package-info.groovy b/src/test/groovy/annotations/package-info.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/annotations/package-info.groovy
rename to src/test/groovy/annotations/package-info.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/beans/BindableTest.groovy b/src/test/groovy/beans/BindableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/beans/BindableTest.groovy
rename to src/test/groovy/beans/BindableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/beans/ListenerListASTTest.groovy b/src/test/groovy/beans/ListenerListASTTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/beans/ListenerListASTTest.groovy
rename to src/test/groovy/beans/ListenerListASTTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/beans/ListenerListHelper.groovy b/src/test/groovy/beans/ListenerListHelper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/beans/ListenerListHelper.groovy
rename to src/test/groovy/beans/ListenerListHelper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/beans/VetoableTest.groovy b/src/test/groovy/beans/VetoableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/beans/VetoableTest.groovy
rename to src/test/groovy/beans/VetoableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/benchmarks/createLoop.groovy b/src/test/groovy/benchmarks/createLoop.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/benchmarks/createLoop.groovy
rename to src/test/groovy/benchmarks/createLoop.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/benchmarks/loop.groovy b/src/test/groovy/benchmarks/loop.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/benchmarks/loop.groovy
rename to src/test/groovy/benchmarks/loop.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/benchmarks/loop2.groovy b/src/test/groovy/benchmarks/loop2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/benchmarks/loop2.groovy
rename to src/test/groovy/benchmarks/loop2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy b/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy
rename to src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ArrayMethodCallBug.groovy b/src/test/groovy/bugs/ArrayMethodCallBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ArrayMethodCallBug.groovy
rename to src/test/groovy/bugs/ArrayMethodCallBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AsBoolBug.groovy b/src/test/groovy/bugs/AsBoolBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AsBoolBug.groovy
rename to src/test/groovy/bugs/AsBoolBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy b/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy
rename to src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AttributeSetExpressionBug.groovy b/src/test/groovy/bugs/AttributeSetExpressionBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AttributeSetExpressionBug.groovy
rename to src/test/groovy/bugs/AttributeSetExpressionBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy b/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy
rename to src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy b/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy
rename to src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BadScriptNameBug.groovy b/src/test/groovy/bugs/BadScriptNameBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BadScriptNameBug.groovy
rename to src/test/groovy/bugs/BadScriptNameBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BenchmarkBug.groovy b/src/test/groovy/bugs/BenchmarkBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BenchmarkBug.groovy
rename to src/test/groovy/bugs/BenchmarkBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BlockAsClosureBug.groovy b/src/test/groovy/bugs/BlockAsClosureBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BlockAsClosureBug.groovy
rename to src/test/groovy/bugs/BlockAsClosureBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BooleanBug.groovy b/src/test/groovy/bugs/BooleanBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BooleanBug.groovy
rename to src/test/groovy/bugs/BooleanBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ByteIndexBug.groovy b/src/test/groovy/bugs/ByteIndexBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ByteIndexBug.groovy
rename to src/test/groovy/bugs/ByteIndexBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode2Bug.groovy b/src/test/groovy/bugs/Bytecode2Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode2Bug.groovy
rename to src/test/groovy/bugs/Bytecode2Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode3Bug.groovy b/src/test/groovy/bugs/Bytecode3Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode3Bug.groovy
rename to src/test/groovy/bugs/Bytecode3Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode4Bug.groovy b/src/test/groovy/bugs/Bytecode4Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode4Bug.groovy
rename to src/test/groovy/bugs/Bytecode4Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode5Bug.groovy b/src/test/groovy/bugs/Bytecode5Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode5Bug.groovy
rename to src/test/groovy/bugs/Bytecode5Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode6Bug.groovy b/src/test/groovy/bugs/Bytecode6Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode6Bug.groovy
rename to src/test/groovy/bugs/Bytecode6Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode7Bug.groovy b/src/test/groovy/bugs/Bytecode7Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Bytecode7Bug.groovy
rename to src/test/groovy/bugs/Bytecode7Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BytecodeBug.groovy b/src/test/groovy/bugs/BytecodeBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/BytecodeBug.groovy
rename to src/test/groovy/bugs/BytecodeBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy b/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy
rename to src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy b/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy
rename to src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ChristofsPropertyBug.groovy b/src/test/groovy/bugs/ChristofsPropertyBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ChristofsPropertyBug.groovy
rename to src/test/groovy/bugs/ChristofsPropertyBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy b/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy
rename to src/test/groovy/bugs/ClassGeneratorFixesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClassInNamedParamsBug.groovy b/src/test/groovy/bugs/ClassInNamedParamsBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClassInNamedParamsBug.groovy
rename to src/test/groovy/bugs/ClassInNamedParamsBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClassInScriptBug.java b/src/test/groovy/bugs/ClassInScriptBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClassInScriptBug.java
rename to src/test/groovy/bugs/ClassInScriptBug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureInClosureBug.groovy b/src/test/groovy/bugs/ClosureInClosureBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureInClosureBug.groovy
rename to src/test/groovy/bugs/ClosureInClosureBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureParameterPassingBug.groovy b/src/test/groovy/bugs/ClosureParameterPassingBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureParameterPassingBug.groovy
rename to src/test/groovy/bugs/ClosureParameterPassingBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureTypedVariableBug.groovy b/src/test/groovy/bugs/ClosureTypedVariableBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureTypedVariableBug.groovy
rename to src/test/groovy/bugs/ClosureTypedVariableBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureVariableBug.groovy b/src/test/groovy/bugs/ClosureVariableBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureVariableBug.groovy
rename to src/test/groovy/bugs/ClosureVariableBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy b/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy
rename to src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureWithStaticVariablesBug.groovy b/src/test/groovy/bugs/ClosureWithStaticVariablesBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosureWithStaticVariablesBug.groovy
rename to src/test/groovy/bugs/ClosureWithStaticVariablesBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosuresInScriptBug.java b/src/test/groovy/bugs/ClosuresInScriptBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ClosuresInScriptBug.java
rename to src/test/groovy/bugs/ClosuresInScriptBug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ConstructorBug.groovy b/src/test/groovy/bugs/ConstructorBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ConstructorBug.groovy
rename to src/test/groovy/bugs/ConstructorBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ConstructorParameterBug.groovy b/src/test/groovy/bugs/ConstructorParameterBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ConstructorParameterBug.groovy
rename to src/test/groovy/bugs/ConstructorParameterBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ConstructorThisCallBug.groovy b/src/test/groovy/bugs/ConstructorThisCallBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ConstructorThisCallBug.groovy
rename to src/test/groovy/bugs/ConstructorThisCallBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/CustomMetaClassTest.groovy b/src/test/groovy/bugs/CustomMetaClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/CustomMetaClassTest.groovy
rename to src/test/groovy/bugs/CustomMetaClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/DefVariableBug.groovy b/src/test/groovy/bugs/DefVariableBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/DefVariableBug.groovy
rename to src/test/groovy/bugs/DefVariableBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy b/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy
rename to src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/DoubleSizeParametersBug.groovy b/src/test/groovy/bugs/DoubleSizeParametersBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/DoubleSizeParametersBug.groovy
rename to src/test/groovy/bugs/DoubleSizeParametersBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ForLoopBug.groovy b/src/test/groovy/bugs/ForLoopBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ForLoopBug.groovy
rename to src/test/groovy/bugs/ForLoopBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/FullyQualifiedClassBug.groovy b/src/test/groovy/bugs/FullyQualifiedClassBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/FullyQualifiedClassBug.groovy
rename to src/test/groovy/bugs/FullyQualifiedClassBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy b/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy
rename to src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy b/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy
rename to src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A1.java b/src/test/groovy/bugs/G3839A1.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A1.java
rename to src/test/groovy/bugs/G3839A1.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A2.java b/src/test/groovy/bugs/G3839A2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A2.java
rename to src/test/groovy/bugs/G3839A2.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A3.java b/src/test/groovy/bugs/G3839A3.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A3.java
rename to src/test/groovy/bugs/G3839A3.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A4.java b/src/test/groovy/bugs/G3839A4.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839A4.java
rename to src/test/groovy/bugs/G3839A4.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839Transform1.java b/src/test/groovy/bugs/G3839Transform1.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839Transform1.java
rename to src/test/groovy/bugs/G3839Transform1.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839Transform2.java b/src/test/groovy/bugs/G3839Transform2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839Transform2.java
rename to src/test/groovy/bugs/G3839Transform2.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839Transform3.java b/src/test/groovy/bugs/G3839Transform3.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G3839Transform3.java
rename to src/test/groovy/bugs/G3839Transform3.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G4410JavaStringProducer.java b/src/test/groovy/bugs/G4410JavaStringProducer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G4410JavaStringProducer.java
rename to src/test/groovy/bugs/G4410JavaStringProducer.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G4410Producer1.java b/src/test/groovy/bugs/G4410Producer1.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G4410Producer1.java
rename to src/test/groovy/bugs/G4410Producer1.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G4410Producer2.java b/src/test/groovy/bugs/G4410Producer2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/G4410Producer2.java
rename to src/test/groovy/bugs/G4410Producer2.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GROOVY3934Helper.groovy b/src/test/groovy/bugs/GROOVY3934Helper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GROOVY3934Helper.groovy
rename to src/test/groovy/bugs/GROOVY3934Helper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GetterBug.groovy b/src/test/groovy/bugs/GetterBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GetterBug.groovy
rename to src/test/groovy/bugs/GetterBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1018_Bug.groovy b/src/test/groovy/bugs/Groovy1018_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1018_Bug.groovy
rename to src/test/groovy/bugs/Groovy1018_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1059_Bug.groovy b/src/test/groovy/bugs/Groovy1059_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1059_Bug.groovy
rename to src/test/groovy/bugs/Groovy1059_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1081_Bug.groovy b/src/test/groovy/bugs/Groovy1081_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1081_Bug.groovy
rename to src/test/groovy/bugs/Groovy1081_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1407_Bug.groovy b/src/test/groovy/bugs/Groovy1407_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1407_Bug.groovy
rename to src/test/groovy/bugs/Groovy1407_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1462_Bug.groovy b/src/test/groovy/bugs/Groovy1462_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1462_Bug.groovy
rename to src/test/groovy/bugs/Groovy1462_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1465Bug.groovy b/src/test/groovy/bugs/Groovy1465Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1465Bug.groovy
rename to src/test/groovy/bugs/Groovy1465Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1567_Bug.java b/src/test/groovy/bugs/Groovy1567_Bug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1567_Bug.java
rename to src/test/groovy/bugs/Groovy1567_Bug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1593.groovy b/src/test/groovy/bugs/Groovy1593.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1593.groovy
rename to src/test/groovy/bugs/Groovy1593.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1617_Bug.groovy b/src/test/groovy/bugs/Groovy1617_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1617_Bug.groovy
rename to src/test/groovy/bugs/Groovy1617_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1706_Bug.groovy b/src/test/groovy/bugs/Groovy1706_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1706_Bug.groovy
rename to src/test/groovy/bugs/Groovy1706_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1759_Bug.groovy b/src/test/groovy/bugs/Groovy1759_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy1759_Bug.groovy
rename to src/test/groovy/bugs/Groovy1759_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2271Bug.groovy b/src/test/groovy/bugs/Groovy2271Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2271Bug.groovy
rename to src/test/groovy/bugs/Groovy2271Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2339Bug.groovy b/src/test/groovy/bugs/Groovy2339Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2339Bug.groovy
rename to src/test/groovy/bugs/Groovy2339Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2348Bug.groovy b/src/test/groovy/bugs/Groovy2348Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2348Bug.groovy
rename to src/test/groovy/bugs/Groovy2348Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2350Bug.groovy b/src/test/groovy/bugs/Groovy2350Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2350Bug.groovy
rename to src/test/groovy/bugs/Groovy2350Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2351Bug.groovy b/src/test/groovy/bugs/Groovy2351Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2351Bug.groovy
rename to src/test/groovy/bugs/Groovy2351Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2365Base.groovy b/src/test/groovy/bugs/Groovy2365Base.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2365Base.groovy
rename to src/test/groovy/bugs/Groovy2365Base.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2365Bug.java b/src/test/groovy/bugs/Groovy2365Bug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2365Bug.java
rename to src/test/groovy/bugs/Groovy2365Bug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2391Bug.groovy b/src/test/groovy/bugs/Groovy2391Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2391Bug.groovy
rename to src/test/groovy/bugs/Groovy2391Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy239_Bug.groovy b/src/test/groovy/bugs/Groovy239_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy239_Bug.groovy
rename to src/test/groovy/bugs/Groovy239_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2432Bug.groovy b/src/test/groovy/bugs/Groovy2432Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2432Bug.groovy
rename to src/test/groovy/bugs/Groovy2432Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2490Bug.groovy b/src/test/groovy/bugs/Groovy2490Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2490Bug.groovy
rename to src/test/groovy/bugs/Groovy2490Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy252_Bug.groovy b/src/test/groovy/bugs/Groovy252_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy252_Bug.groovy
rename to src/test/groovy/bugs/Groovy252_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2549Bug.groovy b/src/test/groovy/bugs/Groovy2549Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2549Bug.groovy
rename to src/test/groovy/bugs/Groovy2549Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2553Bug.java b/src/test/groovy/bugs/Groovy2553Bug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2553Bug.java
rename to src/test/groovy/bugs/Groovy2553Bug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2556Bug.groovy b/src/test/groovy/bugs/Groovy2556Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2556Bug.groovy
rename to src/test/groovy/bugs/Groovy2556Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2557Bug.groovy b/src/test/groovy/bugs/Groovy2557Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2557Bug.groovy
rename to src/test/groovy/bugs/Groovy2557Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2558Bug.groovy b/src/test/groovy/bugs/Groovy2558Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2558Bug.groovy
rename to src/test/groovy/bugs/Groovy2558Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2666Bug.groovy b/src/test/groovy/bugs/Groovy2666Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2666Bug.groovy
rename to src/test/groovy/bugs/Groovy2666Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2706Bug.groovy b/src/test/groovy/bugs/Groovy2706Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2706Bug.groovy
rename to src/test/groovy/bugs/Groovy2706Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy278_Bug.groovy b/src/test/groovy/bugs/Groovy278_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy278_Bug.groovy
rename to src/test/groovy/bugs/Groovy278_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2801Bug.groovy b/src/test/groovy/bugs/Groovy2801Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2801Bug.groovy
rename to src/test/groovy/bugs/Groovy2801Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2816Bug.groovy b/src/test/groovy/bugs/Groovy2816Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2816Bug.groovy
rename to src/test/groovy/bugs/Groovy2816Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2849Bug.groovy b/src/test/groovy/bugs/Groovy2849Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2849Bug.groovy
rename to src/test/groovy/bugs/Groovy2849Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2949Bug.groovy b/src/test/groovy/bugs/Groovy2949Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2949Bug.groovy
rename to src/test/groovy/bugs/Groovy2949Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2951Bug.groovy b/src/test/groovy/bugs/Groovy2951Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy2951Bug.groovy
rename to src/test/groovy/bugs/Groovy2951Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3069Bug.groovy b/src/test/groovy/bugs/Groovy3069Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3069Bug.groovy
rename to src/test/groovy/bugs/Groovy3069Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy308_Bug.groovy b/src/test/groovy/bugs/Groovy308_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy308_Bug.groovy
rename to src/test/groovy/bugs/Groovy308_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3135Bug.groovy b/src/test/groovy/bugs/Groovy3135Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3135Bug.groovy
rename to src/test/groovy/bugs/Groovy3135Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3139Bug.groovy b/src/test/groovy/bugs/Groovy3139Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3139Bug.groovy
rename to src/test/groovy/bugs/Groovy3139Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3156And2621Bug.groovy b/src/test/groovy/bugs/Groovy3156And2621Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3156And2621Bug.groovy
rename to src/test/groovy/bugs/Groovy3156And2621Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3163Bug.groovy b/src/test/groovy/bugs/Groovy3163Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3163Bug.groovy
rename to src/test/groovy/bugs/Groovy3163Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3175_Bug.groovy b/src/test/groovy/bugs/Groovy3175_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3175_Bug.groovy
rename to src/test/groovy/bugs/Groovy3175_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3205Bug.groovy b/src/test/groovy/bugs/Groovy3205Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3205Bug.groovy
rename to src/test/groovy/bugs/Groovy3205Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3208Bug.groovy b/src/test/groovy/bugs/Groovy3208Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3208Bug.groovy
rename to src/test/groovy/bugs/Groovy3208Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3235Bug.groovy b/src/test/groovy/bugs/Groovy3235Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3235Bug.groovy
rename to src/test/groovy/bugs/Groovy3235Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3238Bug.groovy b/src/test/groovy/bugs/Groovy3238Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3238Bug.groovy
rename to src/test/groovy/bugs/Groovy3238Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy325_Bug.groovy b/src/test/groovy/bugs/Groovy325_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy325_Bug.groovy
rename to src/test/groovy/bugs/Groovy325_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3304Bug.groovy b/src/test/groovy/bugs/Groovy3304Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3304Bug.groovy
rename to src/test/groovy/bugs/Groovy3304Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3305Bug.groovy b/src/test/groovy/bugs/Groovy3305Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3305Bug.groovy
rename to src/test/groovy/bugs/Groovy3305Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3311Bug.groovy b/src/test/groovy/bugs/Groovy3311Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3311Bug.groovy
rename to src/test/groovy/bugs/Groovy3311Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3335Bug.groovy b/src/test/groovy/bugs/Groovy3335Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3335Bug.groovy
rename to src/test/groovy/bugs/Groovy3335Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3339Bug.groovy b/src/test/groovy/bugs/Groovy3339Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3339Bug.groovy
rename to src/test/groovy/bugs/Groovy3339Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3383Bug.groovy b/src/test/groovy/bugs/Groovy3383Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3383Bug.groovy
rename to src/test/groovy/bugs/Groovy3383Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3389Bug.groovy b/src/test/groovy/bugs/Groovy3389Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3389Bug.groovy
rename to src/test/groovy/bugs/Groovy3389Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3403Bug.groovy b/src/test/groovy/bugs/Groovy3403Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3403Bug.groovy
rename to src/test/groovy/bugs/Groovy3403Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3405Bug.groovy b/src/test/groovy/bugs/Groovy3405Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3405Bug.groovy
rename to src/test/groovy/bugs/Groovy3405Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3410Bug.groovy b/src/test/groovy/bugs/Groovy3410Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3410Bug.groovy
rename to src/test/groovy/bugs/Groovy3410Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3424Bug.groovy b/src/test/groovy/bugs/Groovy3424Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3424Bug.groovy
rename to src/test/groovy/bugs/Groovy3424Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3426Bug.groovy b/src/test/groovy/bugs/Groovy3426Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3426Bug.groovy
rename to src/test/groovy/bugs/Groovy3426Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3462Bug.groovy b/src/test/groovy/bugs/Groovy3462Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3462Bug.groovy
rename to src/test/groovy/bugs/Groovy3462Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3464Bug.groovy b/src/test/groovy/bugs/Groovy3464Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3464Bug.groovy
rename to src/test/groovy/bugs/Groovy3464Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3465Bug.groovy b/src/test/groovy/bugs/Groovy3465Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3465Bug.groovy
rename to src/test/groovy/bugs/Groovy3465Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3465Helper.groovy b/src/test/groovy/bugs/Groovy3465Helper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3465Helper.groovy
rename to src/test/groovy/bugs/Groovy3465Helper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3498Bug.groovy b/src/test/groovy/bugs/Groovy3498Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3498Bug.groovy
rename to src/test/groovy/bugs/Groovy3498Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3509Bug.groovy b/src/test/groovy/bugs/Groovy3509Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3509Bug.groovy
rename to src/test/groovy/bugs/Groovy3509Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3511Bug.groovy b/src/test/groovy/bugs/Groovy3511Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3511Bug.groovy
rename to src/test/groovy/bugs/Groovy3511Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3519Bug.groovy b/src/test/groovy/bugs/Groovy3519Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3519Bug.groovy
rename to src/test/groovy/bugs/Groovy3519Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3560Bug.groovy b/src/test/groovy/bugs/Groovy3560Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3560Bug.groovy
rename to src/test/groovy/bugs/Groovy3560Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3560Helper.java b/src/test/groovy/bugs/Groovy3560Helper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3560Helper.java
rename to src/test/groovy/bugs/Groovy3560Helper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3574Bug.groovy b/src/test/groovy/bugs/Groovy3574Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3574Bug.groovy
rename to src/test/groovy/bugs/Groovy3574Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3590Bug.groovy b/src/test/groovy/bugs/Groovy3590Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3590Bug.groovy
rename to src/test/groovy/bugs/Groovy3590Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3596Bug.groovy b/src/test/groovy/bugs/Groovy3596Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3596Bug.groovy
rename to src/test/groovy/bugs/Groovy3596Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3645Bug.groovy b/src/test/groovy/bugs/Groovy3645Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3645Bug.groovy
rename to src/test/groovy/bugs/Groovy3645Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3658Bug.groovy b/src/test/groovy/bugs/Groovy3658Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3658Bug.groovy
rename to src/test/groovy/bugs/Groovy3658Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3679Bug.groovy b/src/test/groovy/bugs/Groovy3679Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3679Bug.groovy
rename to src/test/groovy/bugs/Groovy3679Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3716Bug.groovy b/src/test/groovy/bugs/Groovy3716Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3716Bug.groovy
rename to src/test/groovy/bugs/Groovy3716Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3718Bug.groovy b/src/test/groovy/bugs/Groovy3718Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3718Bug.groovy
rename to src/test/groovy/bugs/Groovy3718Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3719Bug.groovy b/src/test/groovy/bugs/Groovy3719Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3719Bug.groovy
rename to src/test/groovy/bugs/Groovy3719Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3719Bug_script.groovy b/src/test/groovy/bugs/Groovy3719Bug_script.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3719Bug_script.groovy
rename to src/test/groovy/bugs/Groovy3719Bug_script.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3720Bug.groovy b/src/test/groovy/bugs/Groovy3720Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3720Bug.groovy
rename to src/test/groovy/bugs/Groovy3720Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3721Bug.groovy b/src/test/groovy/bugs/Groovy3721Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3721Bug.groovy
rename to src/test/groovy/bugs/Groovy3721Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3723Bug.groovy b/src/test/groovy/bugs/Groovy3723Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3723Bug.groovy
rename to src/test/groovy/bugs/Groovy3723Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3726Bug.groovy b/src/test/groovy/bugs/Groovy3726Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3726Bug.groovy
rename to src/test/groovy/bugs/Groovy3726Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3731Bug.groovy b/src/test/groovy/bugs/Groovy3731Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3731Bug.groovy
rename to src/test/groovy/bugs/Groovy3731Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3749Bug.groovy b/src/test/groovy/bugs/Groovy3749Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3749Bug.groovy
rename to src/test/groovy/bugs/Groovy3749Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3768Bug.groovy b/src/test/groovy/bugs/Groovy3768Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3768Bug.groovy
rename to src/test/groovy/bugs/Groovy3768Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3770Bug.groovy b/src/test/groovy/bugs/Groovy3770Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3770Bug.groovy
rename to src/test/groovy/bugs/Groovy3770Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3776Bug.groovy b/src/test/groovy/bugs/Groovy3776Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3776Bug.groovy
rename to src/test/groovy/bugs/Groovy3776Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3784Bug.groovy b/src/test/groovy/bugs/Groovy3784Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3784Bug.groovy
rename to src/test/groovy/bugs/Groovy3784Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3789Bug.groovy b/src/test/groovy/bugs/Groovy3789Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3789Bug.groovy
rename to src/test/groovy/bugs/Groovy3789Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3799Bug.groovy b/src/test/groovy/bugs/Groovy3799Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3799Bug.groovy
rename to src/test/groovy/bugs/Groovy3799Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3799Helper.java b/src/test/groovy/bugs/Groovy3799Helper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3799Helper.java
rename to src/test/groovy/bugs/Groovy3799Helper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3801Bug.groovy b/src/test/groovy/bugs/Groovy3801Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3801Bug.groovy
rename to src/test/groovy/bugs/Groovy3801Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3817Bug.groovy b/src/test/groovy/bugs/Groovy3817Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3817Bug.groovy
rename to src/test/groovy/bugs/Groovy3817Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3818Bug.groovy b/src/test/groovy/bugs/Groovy3818Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3818Bug.groovy
rename to src/test/groovy/bugs/Groovy3818Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3827Bug.groovy b/src/test/groovy/bugs/Groovy3827Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3827Bug.groovy
rename to src/test/groovy/bugs/Groovy3827Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3830Bug.groovy b/src/test/groovy/bugs/Groovy3830Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3830Bug.groovy
rename to src/test/groovy/bugs/Groovy3830Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3831Bug.groovy b/src/test/groovy/bugs/Groovy3831Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3831Bug.groovy
rename to src/test/groovy/bugs/Groovy3831Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3834Bug.groovy b/src/test/groovy/bugs/Groovy3834Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3834Bug.groovy
rename to src/test/groovy/bugs/Groovy3834Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3839Bug.groovy b/src/test/groovy/bugs/Groovy3839Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3839Bug.groovy
rename to src/test/groovy/bugs/Groovy3839Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3852Bug.groovy b/src/test/groovy/bugs/Groovy3852Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3852Bug.groovy
rename to src/test/groovy/bugs/Groovy3852Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3857Bug.groovy b/src/test/groovy/bugs/Groovy3857Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3857Bug.groovy
rename to src/test/groovy/bugs/Groovy3857Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3863Bug.groovy b/src/test/groovy/bugs/Groovy3863Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3863Bug.groovy
rename to src/test/groovy/bugs/Groovy3863Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3868Bug.groovy b/src/test/groovy/bugs/Groovy3868Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3868Bug.groovy
rename to src/test/groovy/bugs/Groovy3868Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3871Bug.groovy b/src/test/groovy/bugs/Groovy3871Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3871Bug.groovy
rename to src/test/groovy/bugs/Groovy3871Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3873Bug.groovy b/src/test/groovy/bugs/Groovy3873Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3873Bug.groovy
rename to src/test/groovy/bugs/Groovy3873Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3876Bug.groovy b/src/test/groovy/bugs/Groovy3876Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3876Bug.groovy
rename to src/test/groovy/bugs/Groovy3876Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3894Bug.groovy b/src/test/groovy/bugs/Groovy3894Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3894Bug.groovy
rename to src/test/groovy/bugs/Groovy3894Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy389_Bug.groovy b/src/test/groovy/bugs/Groovy389_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy389_Bug.groovy
rename to src/test/groovy/bugs/Groovy389_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3904Bug.groovy b/src/test/groovy/bugs/Groovy3904Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3904Bug.groovy
rename to src/test/groovy/bugs/Groovy3904Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3949Bug.groovy b/src/test/groovy/bugs/Groovy3949Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3949Bug.groovy
rename to src/test/groovy/bugs/Groovy3949Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3989Bug.groovy b/src/test/groovy/bugs/Groovy3989Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy3989Bug.groovy
rename to src/test/groovy/bugs/Groovy3989Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4006Bug.groovy b/src/test/groovy/bugs/Groovy4006Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4006Bug.groovy
rename to src/test/groovy/bugs/Groovy4006Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4009Bug.groovy b/src/test/groovy/bugs/Groovy4009Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4009Bug.groovy
rename to src/test/groovy/bugs/Groovy4009Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4025Bug.groovy b/src/test/groovy/bugs/Groovy4025Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4025Bug.groovy
rename to src/test/groovy/bugs/Groovy4025Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4029Bug.groovy b/src/test/groovy/bugs/Groovy4029Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4029Bug.groovy
rename to src/test/groovy/bugs/Groovy4029Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4035Bug.groovy b/src/test/groovy/bugs/Groovy4035Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4035Bug.groovy
rename to src/test/groovy/bugs/Groovy4035Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4038Bug.groovy b/src/test/groovy/bugs/Groovy4038Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4038Bug.groovy
rename to src/test/groovy/bugs/Groovy4038Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4043Bug.groovy b/src/test/groovy/bugs/Groovy4043Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4043Bug.groovy
rename to src/test/groovy/bugs/Groovy4043Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4046Bug.groovy b/src/test/groovy/bugs/Groovy4046Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4046Bug.groovy
rename to src/test/groovy/bugs/Groovy4046Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4069Bug.groovy b/src/test/groovy/bugs/Groovy4069Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4069Bug.groovy
rename to src/test/groovy/bugs/Groovy4069Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4075Bug.groovy b/src/test/groovy/bugs/Groovy4075Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4075Bug.groovy
rename to src/test/groovy/bugs/Groovy4075Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4078Bug.groovy b/src/test/groovy/bugs/Groovy4078Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4078Bug.groovy
rename to src/test/groovy/bugs/Groovy4078Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4080Bug.groovy b/src/test/groovy/bugs/Groovy4080Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4080Bug.groovy
rename to src/test/groovy/bugs/Groovy4080Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4081Bug.groovy b/src/test/groovy/bugs/Groovy4081Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4081Bug.groovy
rename to src/test/groovy/bugs/Groovy4081Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4098Bug.groovy b/src/test/groovy/bugs/Groovy4098Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4098Bug.groovy
rename to src/test/groovy/bugs/Groovy4098Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4098Child.groovy b/src/test/groovy/bugs/Groovy4098Child.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4098Child.groovy
rename to src/test/groovy/bugs/Groovy4098Child.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4098Parent.groovy b/src/test/groovy/bugs/Groovy4098Parent.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4098Parent.groovy
rename to src/test/groovy/bugs/Groovy4098Parent.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4104A.java b/src/test/groovy/bugs/Groovy4104A.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4104A.java
rename to src/test/groovy/bugs/Groovy4104A.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4104B.java b/src/test/groovy/bugs/Groovy4104B.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4104B.java
rename to src/test/groovy/bugs/Groovy4104B.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4104Bug.groovy b/src/test/groovy/bugs/Groovy4104Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4104Bug.groovy
rename to src/test/groovy/bugs/Groovy4104Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4106Bug.groovy b/src/test/groovy/bugs/Groovy4106Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4106Bug.groovy
rename to src/test/groovy/bugs/Groovy4106Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4107Bug.groovy b/src/test/groovy/bugs/Groovy4107Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4107Bug.groovy
rename to src/test/groovy/bugs/Groovy4107Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4111Bug.groovy b/src/test/groovy/bugs/Groovy4111Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4111Bug.groovy
rename to src/test/groovy/bugs/Groovy4111Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4116Bug.groovy b/src/test/groovy/bugs/Groovy4116Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4116Bug.groovy
rename to src/test/groovy/bugs/Groovy4116Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4119Bug.groovy b/src/test/groovy/bugs/Groovy4119Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4119Bug.groovy
rename to src/test/groovy/bugs/Groovy4119Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4120Bug.groovy b/src/test/groovy/bugs/Groovy4120Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4120Bug.groovy
rename to src/test/groovy/bugs/Groovy4120Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4121Bug.groovy b/src/test/groovy/bugs/Groovy4121Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4121Bug.groovy
rename to src/test/groovy/bugs/Groovy4121Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4129Bug.groovy b/src/test/groovy/bugs/Groovy4129Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4129Bug.groovy
rename to src/test/groovy/bugs/Groovy4129Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4131Bug.groovy b/src/test/groovy/bugs/Groovy4131Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4131Bug.groovy
rename to src/test/groovy/bugs/Groovy4131Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4133Bug.groovy b/src/test/groovy/bugs/Groovy4133Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4133Bug.groovy
rename to src/test/groovy/bugs/Groovy4133Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4134Bug.groovy b/src/test/groovy/bugs/Groovy4134Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4134Bug.groovy
rename to src/test/groovy/bugs/Groovy4134Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4139Bug.groovy b/src/test/groovy/bugs/Groovy4139Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4139Bug.groovy
rename to src/test/groovy/bugs/Groovy4139Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4145.groovy b/src/test/groovy/bugs/Groovy4145.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4145.groovy
rename to src/test/groovy/bugs/Groovy4145.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4151Bug.groovy b/src/test/groovy/bugs/Groovy4151Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4151Bug.groovy
rename to src/test/groovy/bugs/Groovy4151Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4169Bug.groovy b/src/test/groovy/bugs/Groovy4169Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4169Bug.groovy
rename to src/test/groovy/bugs/Groovy4169Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4170Bug.groovy b/src/test/groovy/bugs/Groovy4170Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4170Bug.groovy
rename to src/test/groovy/bugs/Groovy4170Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4188Bug.groovy b/src/test/groovy/bugs/Groovy4188Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4188Bug.groovy
rename to src/test/groovy/bugs/Groovy4188Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4190Bug.groovy b/src/test/groovy/bugs/Groovy4190Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4190Bug.groovy
rename to src/test/groovy/bugs/Groovy4190Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4191Bug.groovy b/src/test/groovy/bugs/Groovy4191Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4191Bug.groovy
rename to src/test/groovy/bugs/Groovy4191Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4193Bug.groovy b/src/test/groovy/bugs/Groovy4193Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4193Bug.groovy
rename to src/test/groovy/bugs/Groovy4193Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4202Bug.groovy b/src/test/groovy/bugs/Groovy4202Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4202Bug.groovy
rename to src/test/groovy/bugs/Groovy4202Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4206Bug.groovy b/src/test/groovy/bugs/Groovy4206Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4206Bug.groovy
rename to src/test/groovy/bugs/Groovy4206Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4235Bug.groovy b/src/test/groovy/bugs/Groovy4235Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4235Bug.groovy
rename to src/test/groovy/bugs/Groovy4235Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4241Bug.groovy b/src/test/groovy/bugs/Groovy4241Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4241Bug.groovy
rename to src/test/groovy/bugs/Groovy4241Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4243Bug.groovy b/src/test/groovy/bugs/Groovy4243Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4243Bug.groovy
rename to src/test/groovy/bugs/Groovy4243Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4246Bug.groovy b/src/test/groovy/bugs/Groovy4246Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4246Bug.groovy
rename to src/test/groovy/bugs/Groovy4246Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4247Bug.groovy b/src/test/groovy/bugs/Groovy4247Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4247Bug.groovy
rename to src/test/groovy/bugs/Groovy4247Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4252Bug.groovy b/src/test/groovy/bugs/Groovy4252Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4252Bug.groovy
rename to src/test/groovy/bugs/Groovy4252Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4257Bug.groovy b/src/test/groovy/bugs/Groovy4257Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4257Bug.groovy
rename to src/test/groovy/bugs/Groovy4257Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4264Bug.groovy b/src/test/groovy/bugs/Groovy4264Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4264Bug.groovy
rename to src/test/groovy/bugs/Groovy4264Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4272Bug.groovy b/src/test/groovy/bugs/Groovy4272Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4272Bug.groovy
rename to src/test/groovy/bugs/Groovy4272Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4273Bug.groovy b/src/test/groovy/bugs/Groovy4273Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4273Bug.groovy
rename to src/test/groovy/bugs/Groovy4273Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4293Bug.groovy b/src/test/groovy/bugs/Groovy4293Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4293Bug.groovy
rename to src/test/groovy/bugs/Groovy4293Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4325Bug.groovy b/src/test/groovy/bugs/Groovy4325Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4325Bug.groovy
rename to src/test/groovy/bugs/Groovy4325Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4386_Bug.groovy b/src/test/groovy/bugs/Groovy4386_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4386_Bug.groovy
rename to src/test/groovy/bugs/Groovy4386_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4393Bug.groovy b/src/test/groovy/bugs/Groovy4393Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4393Bug.groovy
rename to src/test/groovy/bugs/Groovy4393Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4393BugV1.foogroovy b/src/test/groovy/bugs/Groovy4393BugV1.foogroovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4393BugV1.foogroovy
rename to src/test/groovy/bugs/Groovy4393BugV1.foogroovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4410Bug.groovy b/src/test/groovy/bugs/Groovy4410Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4410Bug.groovy
rename to src/test/groovy/bugs/Groovy4410Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4414Bug.groovy b/src/test/groovy/bugs/Groovy4414Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4414Bug.groovy
rename to src/test/groovy/bugs/Groovy4414Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4415Bug.groovy b/src/test/groovy/bugs/Groovy4415Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4415Bug.groovy
rename to src/test/groovy/bugs/Groovy4415Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4415BugSupport.java b/src/test/groovy/bugs/Groovy4415BugSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4415BugSupport.java
rename to src/test/groovy/bugs/Groovy4415BugSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4416Bug.groovy b/src/test/groovy/bugs/Groovy4416Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4416Bug.groovy
rename to src/test/groovy/bugs/Groovy4416Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4418Bug.groovy b/src/test/groovy/bugs/Groovy4418Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4418Bug.groovy
rename to src/test/groovy/bugs/Groovy4418Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4435Bug.groovy b/src/test/groovy/bugs/Groovy4435Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4435Bug.groovy
rename to src/test/groovy/bugs/Groovy4435Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4449Bug.groovy b/src/test/groovy/bugs/Groovy4449Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4449Bug.groovy
rename to src/test/groovy/bugs/Groovy4449Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy b/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy
rename to src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4471Bug.groovy b/src/test/groovy/bugs/Groovy4471Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4471Bug.groovy
rename to src/test/groovy/bugs/Groovy4471Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4480Bug.groovy b/src/test/groovy/bugs/Groovy4480Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4480Bug.groovy
rename to src/test/groovy/bugs/Groovy4480Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4497Bug.groovy b/src/test/groovy/bugs/Groovy4497Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4497Bug.groovy
rename to src/test/groovy/bugs/Groovy4497Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4516Bug.groovy b/src/test/groovy/bugs/Groovy4516Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4516Bug.groovy
rename to src/test/groovy/bugs/Groovy4516Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4584Bug.groovy b/src/test/groovy/bugs/Groovy4584Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4584Bug.groovy
rename to src/test/groovy/bugs/Groovy4584Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4607Bug.groovy b/src/test/groovy/bugs/Groovy4607Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4607Bug.groovy
rename to src/test/groovy/bugs/Groovy4607Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4614Bug.groovy b/src/test/groovy/bugs/Groovy4614Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4614Bug.groovy
rename to src/test/groovy/bugs/Groovy4614Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4720Bug.groovy b/src/test/groovy/bugs/Groovy4720Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4720Bug.groovy
rename to src/test/groovy/bugs/Groovy4720Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4857Bug.groovy b/src/test/groovy/bugs/Groovy4857Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4857Bug.groovy
rename to src/test/groovy/bugs/Groovy4857Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4861Bug.groovy b/src/test/groovy/bugs/Groovy4861Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4861Bug.groovy
rename to src/test/groovy/bugs/Groovy4861Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4922Bug.groovy b/src/test/groovy/bugs/Groovy4922Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4922Bug.groovy
rename to src/test/groovy/bugs/Groovy4922Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4958Bug.groovy b/src/test/groovy/bugs/Groovy4958Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4958Bug.groovy
rename to src/test/groovy/bugs/Groovy4958Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4966Bug.groovy b/src/test/groovy/bugs/Groovy4966Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4966Bug.groovy
rename to src/test/groovy/bugs/Groovy4966Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4967Bug.groovy b/src/test/groovy/bugs/Groovy4967Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4967Bug.groovy
rename to src/test/groovy/bugs/Groovy4967Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4973Bug.groovy b/src/test/groovy/bugs/Groovy4973Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4973Bug.groovy
rename to src/test/groovy/bugs/Groovy4973Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4980Bug.groovy b/src/test/groovy/bugs/Groovy4980Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4980Bug.groovy
rename to src/test/groovy/bugs/Groovy4980Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4986Bug.groovy b/src/test/groovy/bugs/Groovy4986Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4986Bug.groovy
rename to src/test/groovy/bugs/Groovy4986Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4989Bug.groovy b/src/test/groovy/bugs/Groovy4989Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4989Bug.groovy
rename to src/test/groovy/bugs/Groovy4989Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4999Bug.groovy b/src/test/groovy/bugs/Groovy4999Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy4999Bug.groovy
rename to src/test/groovy/bugs/Groovy4999Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5025Bug.groovy b/src/test/groovy/bugs/Groovy5025Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5025Bug.groovy
rename to src/test/groovy/bugs/Groovy5025Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5030Bug.groovy b/src/test/groovy/bugs/Groovy5030Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5030Bug.groovy
rename to src/test/groovy/bugs/Groovy5030Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5033Bug.groovy b/src/test/groovy/bugs/Groovy5033Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5033Bug.groovy
rename to src/test/groovy/bugs/Groovy5033Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5056Bug.groovy b/src/test/groovy/bugs/Groovy5056Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5056Bug.groovy
rename to src/test/groovy/bugs/Groovy5056Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5061.groovy b/src/test/groovy/bugs/Groovy5061.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5061.groovy
rename to src/test/groovy/bugs/Groovy5061.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5101Test.groovy b/src/test/groovy/bugs/Groovy5101Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5101Test.groovy
rename to src/test/groovy/bugs/Groovy5101Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5109Bug.groovy b/src/test/groovy/bugs/Groovy5109Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5109Bug.groovy
rename to src/test/groovy/bugs/Groovy5109Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5122Bug.groovy b/src/test/groovy/bugs/Groovy5122Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5122Bug.groovy
rename to src/test/groovy/bugs/Groovy5122Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5137Bug.groovy b/src/test/groovy/bugs/Groovy5137Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5137Bug.groovy
rename to src/test/groovy/bugs/Groovy5137Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy513_Bug.groovy b/src/test/groovy/bugs/Groovy513_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy513_Bug.groovy
rename to src/test/groovy/bugs/Groovy513_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5150Bug.groovy b/src/test/groovy/bugs/Groovy5150Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5150Bug.groovy
rename to src/test/groovy/bugs/Groovy5150Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5152Bug.groovy b/src/test/groovy/bugs/Groovy5152Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5152Bug.groovy
rename to src/test/groovy/bugs/Groovy5152Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5185Bug.groovy b/src/test/groovy/bugs/Groovy5185Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5185Bug.groovy
rename to src/test/groovy/bugs/Groovy5185Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5193Bug.groovy b/src/test/groovy/bugs/Groovy5193Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5193Bug.groovy
rename to src/test/groovy/bugs/Groovy5193Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5210Bug.groovy b/src/test/groovy/bugs/Groovy5210Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5210Bug.groovy
rename to src/test/groovy/bugs/Groovy5210Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5212Bug.groovy b/src/test/groovy/bugs/Groovy5212Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5212Bug.groovy
rename to src/test/groovy/bugs/Groovy5212Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5259Bug.groovy b/src/test/groovy/bugs/Groovy5259Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5259Bug.groovy
rename to src/test/groovy/bugs/Groovy5259Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5260Bug.groovy b/src/test/groovy/bugs/Groovy5260Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5260Bug.groovy
rename to src/test/groovy/bugs/Groovy5260Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5267Bug.groovy b/src/test/groovy/bugs/Groovy5267Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5267Bug.groovy
rename to src/test/groovy/bugs/Groovy5267Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5272Bug.groovy b/src/test/groovy/bugs/Groovy5272Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5272Bug.groovy
rename to src/test/groovy/bugs/Groovy5272Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5285Bug.groovy b/src/test/groovy/bugs/Groovy5285Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5285Bug.groovy
rename to src/test/groovy/bugs/Groovy5285Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5418Bug.groovy b/src/test/groovy/bugs/Groovy5418Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5418Bug.groovy
rename to src/test/groovy/bugs/Groovy5418Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5425_Bug.groovy b/src/test/groovy/bugs/Groovy5425_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5425_Bug.groovy
rename to src/test/groovy/bugs/Groovy5425_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5572Bug.groovy b/src/test/groovy/bugs/Groovy5572Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5572Bug.groovy
rename to src/test/groovy/bugs/Groovy5572Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy558_616_Bug.groovy b/src/test/groovy/bugs/Groovy558_616_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy558_616_Bug.groovy
rename to src/test/groovy/bugs/Groovy558_616_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5687Bug.groovy b/src/test/groovy/bugs/Groovy5687Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5687Bug.groovy
rename to src/test/groovy/bugs/Groovy5687Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5783Bug.groovy b/src/test/groovy/bugs/Groovy5783Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5783Bug.groovy
rename to src/test/groovy/bugs/Groovy5783Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5802Bug.groovy b/src/test/groovy/bugs/Groovy5802Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5802Bug.groovy
rename to src/test/groovy/bugs/Groovy5802Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5806Bug.groovy b/src/test/groovy/bugs/Groovy5806Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5806Bug.groovy
rename to src/test/groovy/bugs/Groovy5806Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5915Bug.groovy b/src/test/groovy/bugs/Groovy5915Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy5915Bug.groovy
rename to src/test/groovy/bugs/Groovy5915Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy596_Bug.groovy b/src/test/groovy/bugs/Groovy596_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy596_Bug.groovy
rename to src/test/groovy/bugs/Groovy596_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6041Bug.groovy b/src/test/groovy/bugs/Groovy6041Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6041Bug.groovy
rename to src/test/groovy/bugs/Groovy6041Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6042Bug.groovy b/src/test/groovy/bugs/Groovy6042Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6042Bug.groovy
rename to src/test/groovy/bugs/Groovy6042Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6045Bug.groovy b/src/test/groovy/bugs/Groovy6045Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6045Bug.groovy
rename to src/test/groovy/bugs/Groovy6045Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6072Bug.groovy b/src/test/groovy/bugs/Groovy6072Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6072Bug.groovy
rename to src/test/groovy/bugs/Groovy6072Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6086Bug.groovy b/src/test/groovy/bugs/Groovy6086Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6086Bug.groovy
rename to src/test/groovy/bugs/Groovy6086Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6374Bug.groovy b/src/test/groovy/bugs/Groovy6374Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6374Bug.groovy
rename to src/test/groovy/bugs/Groovy6374Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6508Bug.groovy b/src/test/groovy/bugs/Groovy6508Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6508Bug.groovy
rename to src/test/groovy/bugs/Groovy6508Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6522Bug.groovy b/src/test/groovy/bugs/Groovy6522Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6522Bug.groovy
rename to src/test/groovy/bugs/Groovy6522Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy662Bug.groovy b/src/test/groovy/bugs/Groovy662Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy662Bug.groovy
rename to src/test/groovy/bugs/Groovy662Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy662_JavaClass.java b/src/test/groovy/bugs/Groovy662_JavaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy662_JavaClass.java
rename to src/test/groovy/bugs/Groovy662_JavaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy666_Bug.groovy b/src/test/groovy/bugs/Groovy666_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy666_Bug.groovy
rename to src/test/groovy/bugs/Groovy666_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6722Bug.groovy b/src/test/groovy/bugs/Groovy6722Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6722Bug.groovy
rename to src/test/groovy/bugs/Groovy6722Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy674_Bug.groovy b/src/test/groovy/bugs/Groovy674_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy674_Bug.groovy
rename to src/test/groovy/bugs/Groovy674_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6755Bug.groovy b/src/test/groovy/bugs/Groovy6755Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6755Bug.groovy
rename to src/test/groovy/bugs/Groovy6755Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy675_Bug.groovy b/src/test/groovy/bugs/Groovy675_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy675_Bug.groovy
rename to src/test/groovy/bugs/Groovy675_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6786Bug.groovy b/src/test/groovy/bugs/Groovy6786Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6786Bug.groovy
rename to src/test/groovy/bugs/Groovy6786Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6804Bug.groovy b/src/test/groovy/bugs/Groovy6804Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6804Bug.groovy
rename to src/test/groovy/bugs/Groovy6804Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6808Bug.groovy b/src/test/groovy/bugs/Groovy6808Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6808Bug.groovy
rename to src/test/groovy/bugs/Groovy6808Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6811Bug.groovy b/src/test/groovy/bugs/Groovy6811Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6811Bug.groovy
rename to src/test/groovy/bugs/Groovy6811Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6821Bug.groovy b/src/test/groovy/bugs/Groovy6821Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6821Bug.groovy
rename to src/test/groovy/bugs/Groovy6821Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6830Bug.groovy b/src/test/groovy/bugs/Groovy6830Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6830Bug.groovy
rename to src/test/groovy/bugs/Groovy6830Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6841Bug.groovy b/src/test/groovy/bugs/Groovy6841Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy6841Bug.groovy
rename to src/test/groovy/bugs/Groovy6841Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy7081Bug.groovy b/src/test/groovy/bugs/Groovy7081Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy7081Bug.groovy
rename to src/test/groovy/bugs/Groovy7081Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy770_Bug.groovy b/src/test/groovy/bugs/Groovy770_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy770_Bug.groovy
rename to src/test/groovy/bugs/Groovy770_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy779_Bug.groovy b/src/test/groovy/bugs/Groovy779_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy779_Bug.groovy
rename to src/test/groovy/bugs/Groovy779_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy831_Bug.groovy b/src/test/groovy/bugs/Groovy831_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy831_Bug.groovy
rename to src/test/groovy/bugs/Groovy831_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy872Bug.groovy b/src/test/groovy/bugs/Groovy872Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy872Bug.groovy
rename to src/test/groovy/bugs/Groovy872Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy965_Bug.groovy b/src/test/groovy/bugs/Groovy965_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy965_Bug.groovy
rename to src/test/groovy/bugs/Groovy965_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy996_Bug.groovy b/src/test/groovy/bugs/Groovy996_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/Groovy996_Bug.groovy
rename to src/test/groovy/bugs/Groovy996_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GroovyInnerEnumBug.groovy b/src/test/groovy/bugs/GroovyInnerEnumBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GroovyInnerEnumBug.groovy
rename to src/test/groovy/bugs/GroovyInnerEnumBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GuillaumesBug.groovy b/src/test/groovy/bugs/GuillaumesBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GuillaumesBug.groovy
rename to src/test/groovy/bugs/GuillaumesBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GuillaumesMapBug.groovy b/src/test/groovy/bugs/GuillaumesMapBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/GuillaumesMapBug.groovy
rename to src/test/groovy/bugs/GuillaumesMapBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/IanMaceysBug.java b/src/test/groovy/bugs/IanMaceysBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/IanMaceysBug.java
rename to src/test/groovy/bugs/IanMaceysBug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy b/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy
rename to src/test/groovy/bugs/ImportNodeLineNumberTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/InconsistentStackHeightBug.groovy b/src/test/groovy/bugs/InconsistentStackHeightBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/InconsistentStackHeightBug.groovy
rename to src/test/groovy/bugs/InconsistentStackHeightBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/InterfaceImplBug.groovy b/src/test/groovy/bugs/InterfaceImplBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/InterfaceImplBug.groovy
rename to src/test/groovy/bugs/InterfaceImplBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy b/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy
rename to src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/IterateOverCustomTypeBug.groovy b/src/test/groovy/bugs/IterateOverCustomTypeBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/IterateOverCustomTypeBug.groovy
rename to src/test/groovy/bugs/IterateOverCustomTypeBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MarkupAndMethodBug.groovy b/src/test/groovy/bugs/MarkupAndMethodBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MarkupAndMethodBug.groovy
rename to src/test/groovy/bugs/MarkupAndMethodBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MetaClassCachingBug.groovy b/src/test/groovy/bugs/MetaClassCachingBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MetaClassCachingBug.groovy
rename to src/test/groovy/bugs/MetaClassCachingBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy b/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy
rename to src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodClosureTest.groovy b/src/test/groovy/bugs/MethodClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodClosureTest.groovy
rename to src/test/groovy/bugs/MethodClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodDispatchBug.groovy b/src/test/groovy/bugs/MethodDispatchBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodDispatchBug.groovy
rename to src/test/groovy/bugs/MethodDispatchBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodPointerBug.groovy b/src/test/groovy/bugs/MethodPointerBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MethodPointerBug.groovy
rename to src/test/groovy/bugs/MethodPointerBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MorgansBug.groovy b/src/test/groovy/bugs/MorgansBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MorgansBug.groovy
rename to src/test/groovy/bugs/MorgansBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MyConstants4272.java b/src/test/groovy/bugs/MyConstants4272.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MyConstants4272.java
rename to src/test/groovy/bugs/MyConstants4272.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MyConstantsASTTransformation4272.groovy b/src/test/groovy/bugs/MyConstantsASTTransformation4272.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/MyConstantsASTTransformation4272.groovy
rename to src/test/groovy/bugs/MyConstantsASTTransformation4272.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NestedClosure2Bug.groovy b/src/test/groovy/bugs/NestedClosure2Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NestedClosure2Bug.groovy
rename to src/test/groovy/bugs/NestedClosure2Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NestedClosureBug.groovy b/src/test/groovy/bugs/NestedClosureBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NestedClosureBug.groovy
rename to src/test/groovy/bugs/NestedClosureBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy b/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy
rename to src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NullCompareBug.groovy b/src/test/groovy/bugs/NullCompareBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/NullCompareBug.groovy
rename to src/test/groovy/bugs/NullCompareBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy b/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy
rename to src/test/groovy/bugs/OverloadInvokeMethodBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/POJOCallSiteBug.groovy b/src/test/groovy/bugs/POJOCallSiteBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/POJOCallSiteBug.groovy
rename to src/test/groovy/bugs/POJOCallSiteBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/POJOCallSiteBugFoo.java b/src/test/groovy/bugs/POJOCallSiteBugFoo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/POJOCallSiteBugFoo.java
rename to src/test/groovy/bugs/POJOCallSiteBugFoo.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/PrimitivePropertyBug.groovy b/src/test/groovy/bugs/PrimitivePropertyBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/PrimitivePropertyBug.groovy
rename to src/test/groovy/bugs/PrimitivePropertyBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/PrintlnWithNewBug.groovy b/src/test/groovy/bugs/PrintlnWithNewBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/PrintlnWithNewBug.groovy
rename to src/test/groovy/bugs/PrintlnWithNewBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/PropertyNameBug.groovy b/src/test/groovy/bugs/PropertyNameBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/PropertyNameBug.groovy
rename to src/test/groovy/bugs/PropertyNameBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/RodsBooleanBug.groovy b/src/test/groovy/bugs/RodsBooleanBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/RodsBooleanBug.groovy
rename to src/test/groovy/bugs/RodsBooleanBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/RodsBug.groovy b/src/test/groovy/bugs/RodsBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/RodsBug.groovy
rename to src/test/groovy/bugs/RodsBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/RussellsOptionalParenTest.groovy b/src/test/groovy/bugs/RussellsOptionalParenTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/RussellsOptionalParenTest.groovy
rename to src/test/groovy/bugs/RussellsOptionalParenTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ScriptBug.java b/src/test/groovy/bugs/ScriptBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ScriptBug.java
rename to src/test/groovy/bugs/ScriptBug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SeansBug.java b/src/test/groovy/bugs/SeansBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SeansBug.java
rename to src/test/groovy/bugs/SeansBug.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SimpleModel.java b/src/test/groovy/bugs/SimpleModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SimpleModel.java
rename to src/test/groovy/bugs/SimpleModel.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SingleEvalTest.groovy b/src/test/groovy/bugs/SingleEvalTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SingleEvalTest.groovy
rename to src/test/groovy/bugs/SingleEvalTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticClosurePropertyBug.groovy b/src/test/groovy/bugs/StaticClosurePropertyBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticClosurePropertyBug.groovy
rename to src/test/groovy/bugs/StaticClosurePropertyBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticMethodCallBug.groovy b/src/test/groovy/bugs/StaticMethodCallBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticMethodCallBug.groovy
rename to src/test/groovy/bugs/StaticMethodCallBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticMethodImportBug.groovy b/src/test/groovy/bugs/StaticMethodImportBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticMethodImportBug.groovy
rename to src/test/groovy/bugs/StaticMethodImportBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy b/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy
rename to src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticPropertyBug.groovy b/src/test/groovy/bugs/StaticPropertyBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/StaticPropertyBug.groovy
rename to src/test/groovy/bugs/StaticPropertyBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy b/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy
rename to src/test/groovy/bugs/SubscriptAndExpressionBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SubscriptOnPrimitiveTypeArrayBug.groovy b/src/test/groovy/bugs/SubscriptOnPrimitiveTypeArrayBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SubscriptOnPrimitiveTypeArrayBug.groovy
rename to src/test/groovy/bugs/SubscriptOnPrimitiveTypeArrayBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy b/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy
rename to src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SuperMethod2Bug.groovy b/src/test/groovy/bugs/SuperMethod2Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SuperMethod2Bug.groovy
rename to src/test/groovy/bugs/SuperMethod2Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SuperMethodBug.groovy b/src/test/groovy/bugs/SuperMethodBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SuperMethodBug.groovy
rename to src/test/groovy/bugs/SuperMethodBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy b/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy
rename to src/test/groovy/bugs/SynchronizedBytecodeBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TernaryOperatorTest.groovy b/src/test/groovy/bugs/TernaryOperatorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TernaryOperatorTest.groovy
rename to src/test/groovy/bugs/TernaryOperatorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestBase.groovy b/src/test/groovy/bugs/TestBase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestBase.groovy
rename to src/test/groovy/bugs/TestBase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestCaseBug.groovy b/src/test/groovy/bugs/TestCaseBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestCaseBug.groovy
rename to src/test/groovy/bugs/TestCaseBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestDerived.groovy b/src/test/groovy/bugs/TestDerived.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestDerived.groovy
rename to src/test/groovy/bugs/TestDerived.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestSupport.java b/src/test/groovy/bugs/TestSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TestSupport.java
rename to src/test/groovy/bugs/TestSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ToStringBug.groovy b/src/test/groovy/bugs/ToStringBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ToStringBug.groovy
rename to src/test/groovy/bugs/ToStringBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TryCatch2Bug.groovy b/src/test/groovy/bugs/TryCatch2Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TryCatch2Bug.groovy
rename to src/test/groovy/bugs/TryCatch2Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TryCatchBug.groovy b/src/test/groovy/bugs/TryCatchBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/TryCatchBug.groovy
rename to src/test/groovy/bugs/TryCatchBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/UnknownVariableBug.groovy b/src/test/groovy/bugs/UnknownVariableBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/UnknownVariableBug.groovy
rename to src/test/groovy/bugs/UnknownVariableBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/UseClosureInClosureBug.groovy b/src/test/groovy/bugs/UseClosureInClosureBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/UseClosureInClosureBug.groovy
rename to src/test/groovy/bugs/UseClosureInClosureBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/UseStaticInClosureBug.groovy b/src/test/groovy/bugs/UseStaticInClosureBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/UseStaticInClosureBug.groovy
rename to src/test/groovy/bugs/UseStaticInClosureBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VariablePrecedence.groovy b/src/test/groovy/bugs/VariablePrecedence.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VariablePrecedence.groovy
rename to src/test/groovy/bugs/VariablePrecedence.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VariablePrecedenceTest.groovy b/src/test/groovy/bugs/VariablePrecedenceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VariablePrecedenceTest.groovy
rename to src/test/groovy/bugs/VariablePrecedenceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VariableScopingBug.groovy b/src/test/groovy/bugs/VariableScopingBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VariableScopingBug.groovy
rename to src/test/groovy/bugs/VariableScopingBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VerifyErrorBug.groovy b/src/test/groovy/bugs/VerifyErrorBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/VerifyErrorBug.groovy
rename to src/test/groovy/bugs/VerifyErrorBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy b/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy
rename to src/test/groovy/bugs/WriteOnlyPropertyBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ZoharsBug.groovy b/src/test/groovy/bugs/ZoharsBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/ZoharsBug.groovy
rename to src/test/groovy/bugs/ZoharsBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/bug1567_script.groovy b/src/test/groovy/bugs/bug1567_script.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/bugs/bug1567_script.groovy
rename to src/test/groovy/bugs/bug1567_script.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/execute/ExecuteTest.groovy b/src/test/groovy/execute/ExecuteTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/execute/ExecuteTest.groovy
rename to src/test/groovy/execute/ExecuteTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy b/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy
rename to src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/execute/ExecuteTest_Windows.groovy b/src/test/groovy/execute/ExecuteTest_Windows.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/execute/ExecuteTest_Windows.groovy
rename to src/test/groovy/execute/ExecuteTest_Windows.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/gpath/GPathTest.groovy b/src/test/groovy/gpath/GPathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/gpath/GPathTest.groovy
rename to src/test/groovy/gpath/GPathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/gpath/NodeGPathTest.groovy b/src/test/groovy/gpath/NodeGPathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/gpath/NodeGPathTest.groovy
rename to src/test/groovy/gpath/NodeGPathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrabErrorIsolationTest.groovy b/src/test/groovy/grape/GrabErrorIsolationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrabErrorIsolationTest.groovy
rename to src/test/groovy/grape/GrabErrorIsolationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrabExcludeTest.groovy b/src/test/groovy/grape/GrabExcludeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrabExcludeTest.groovy
rename to src/test/groovy/grape/GrabExcludeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrabResolverTest.groovy b/src/test/groovy/grape/GrabResolverTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrabResolverTest.groovy
rename to src/test/groovy/grape/GrabResolverTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrapeClassLoaderTest.groovy b/src/test/groovy/grape/GrapeClassLoaderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrapeClassLoaderTest.groovy
rename to src/test/groovy/grape/GrapeClassLoaderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrapeIvyTest.groovy b/src/test/groovy/grape/GrapeIvyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/grape/GrapeIvyTest.groovy
rename to src/test/groovy/grape/GrapeIvyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/inspect/InspectorTest.java b/src/test/groovy/inspect/InspectorTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/inspect/InspectorTest.java
rename to src/test/groovy/inspect/InspectorTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/io/LineColumnReaderTest.groovy b/src/test/groovy/io/LineColumnReaderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/io/LineColumnReaderTest.groovy
rename to src/test/groovy/io/LineColumnReaderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/io/PlatformLineWriterTest.java b/src/test/groovy/io/PlatformLineWriterTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/io/PlatformLineWriterTest.java
rename to src/test/groovy/io/PlatformLineWriterTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/io/sample-text-file.txt b/src/test/groovy/io/sample-text-file.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/io/sample-text-file.txt
rename to src/test/groovy/io/sample-text-file.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BaseScriptCustomBodyMethod.java b/src/test/groovy/lang/BaseScriptCustomBodyMethod.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BaseScriptCustomBodyMethod.java
rename to src/test/groovy/lang/BaseScriptCustomBodyMethod.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BenchmarkInterceptorTest.groovy b/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
rename to src/test/groovy/lang/BenchmarkInterceptorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BigDecimalRangeTest.java b/src/test/groovy/lang/BigDecimalRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BigDecimalRangeTest.java
rename to src/test/groovy/lang/BigDecimalRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BigIntegerRangeTest.java b/src/test/groovy/lang/BigIntegerRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/BigIntegerRangeTest.java
rename to src/test/groovy/lang/BigIntegerRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/CategoryAnnotationTest.groovy b/src/test/groovy/lang/CategoryAnnotationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/CategoryAnnotationTest.groovy
rename to src/test/groovy/lang/CategoryAnnotationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/CharacterRangeTest.java b/src/test/groovy/lang/CharacterRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/CharacterRangeTest.java
rename to src/test/groovy/lang/CharacterRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ClassReloadingTest.groovy b/src/test/groovy/lang/ClassReloadingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ClassReloadingTest.groovy
rename to src/test/groovy/lang/ClassReloadingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ClosureResolvingTest.groovy b/src/test/groovy/lang/ClosureResolvingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ClosureResolvingTest.groovy
rename to src/test/groovy/lang/ClosureResolvingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DelegatingMetaClassTest.groovy b/src/test/groovy/lang/DelegatingMetaClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DelegatingMetaClassTest.groovy
rename to src/test/groovy/lang/DelegatingMetaClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DerivedScript.java b/src/test/groovy/lang/DerivedScript.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DerivedScript.java
rename to src/test/groovy/lang/DerivedScript.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DummyGString.java b/src/test/groovy/lang/DummyGString.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DummyGString.java
rename to src/test/groovy/lang/DummyGString.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DummyGStringBase.java b/src/test/groovy/lang/DummyGStringBase.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/DummyGStringBase.java
rename to src/test/groovy/lang/DummyGStringBase.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/EmptyRangeTest.java b/src/test/groovy/lang/EmptyRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/EmptyRangeTest.java
rename to src/test/groovy/lang/EmptyRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ExceptionTest.groovy b/src/test/groovy/lang/ExceptionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ExceptionTest.groovy
rename to src/test/groovy/lang/ExceptionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy b/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
rename to src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ExpandoMetaClassTest.groovy b/src/test/groovy/lang/ExpandoMetaClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ExpandoMetaClassTest.groovy
rename to src/test/groovy/lang/ExpandoMetaClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/FloatRangeTest.java b/src/test/groovy/lang/FloatRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/FloatRangeTest.java
rename to src/test/groovy/lang/FloatRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GStringTest.java b/src/test/groovy/lang/GStringTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GStringTest.java
rename to src/test/groovy/lang/GStringTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GetMethodsTest.groovy b/src/test/groovy/lang/GetMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GetMethodsTest.groovy
rename to src/test/groovy/lang/GetMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/Groovy3406Test.groovy b/src/test/groovy/lang/Groovy3406Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/Groovy3406Test.groovy
rename to src/test/groovy/lang/Groovy3406Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyClassLoaderTest.groovy b/src/test/groovy/lang/GroovyClassLoaderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyClassLoaderTest.groovy
rename to src/test/groovy/lang/GroovyClassLoaderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyCodeSourceTest.groovy b/src/test/groovy/lang/GroovyCodeSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyCodeSourceTest.groovy
rename to src/test/groovy/lang/GroovyCodeSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyShellTest.java b/src/test/groovy/lang/GroovyShellTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyShellTest.java
rename to src/test/groovy/lang/GroovyShellTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyShellTest2.groovy b/src/test/groovy/lang/GroovyShellTest2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovyShellTest2.groovy
rename to src/test/groovy/lang/GroovyShellTest2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovySystemTest.groovy b/src/test/groovy/lang/GroovySystemTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/GroovySystemTest.groovy
rename to src/test/groovy/lang/GroovySystemTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/InnerClassResolvingTest.groovy b/src/test/groovy/lang/InnerClassResolvingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/InnerClassResolvingTest.groovy
rename to src/test/groovy/lang/InnerClassResolvingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/IntRangeTest.groovy b/src/test/groovy/lang/IntRangeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/IntRangeTest.groovy
rename to src/test/groovy/lang/IntRangeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/IntegerRangeTest.java b/src/test/groovy/lang/IntegerRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/IntegerRangeTest.java
rename to src/test/groovy/lang/IntegerRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/InterceptorTest.groovy b/src/test/groovy/lang/InterceptorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/InterceptorTest.groovy
rename to src/test/groovy/lang/InterceptorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/LongRangeTest.java b/src/test/groovy/lang/LongRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/LongRangeTest.java
rename to src/test/groovy/lang/LongRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MapOfClosureTest.groovy b/src/test/groovy/lang/MapOfClosureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MapOfClosureTest.groovy
rename to src/test/groovy/lang/MapOfClosureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MetaClassPropertyTest.groovy b/src/test/groovy/lang/MetaClassPropertyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MetaClassPropertyTest.groovy
rename to src/test/groovy/lang/MetaClassPropertyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MetaClassRegistryTest.groovy b/src/test/groovy/lang/MetaClassRegistryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MetaClassRegistryTest.groovy
rename to src/test/groovy/lang/MetaClassRegistryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MetaClassTest.java b/src/test/groovy/lang/MetaClassTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MetaClassTest.java
rename to src/test/groovy/lang/MetaClassTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MethodMissingTest.groovy b/src/test/groovy/lang/MethodMissingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MethodMissingTest.groovy
rename to src/test/groovy/lang/MethodMissingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MixinAnnotationTest.groovy b/src/test/groovy/lang/MixinAnnotationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MixinAnnotationTest.groovy
rename to src/test/groovy/lang/MixinAnnotationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MixinTest.groovy b/src/test/groovy/lang/MixinTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MixinTest.groovy
rename to src/test/groovy/lang/MixinTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MockWriter.java b/src/test/groovy/lang/MockWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/MockWriter.java
rename to src/test/groovy/lang/MockWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/NumberRangeTest.java b/src/test/groovy/lang/NumberRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/NumberRangeTest.java
rename to src/test/groovy/lang/NumberRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/PropertyMissingTest.groovy b/src/test/groovy/lang/PropertyMissingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/PropertyMissingTest.groovy
rename to src/test/groovy/lang/PropertyMissingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/RangeTest.java b/src/test/groovy/lang/RangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/RangeTest.java
rename to src/test/groovy/lang/RangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ReferenceSerializationTest.groovy b/src/test/groovy/lang/ReferenceSerializationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ReferenceSerializationTest.groovy
rename to src/test/groovy/lang/ReferenceSerializationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/RespondsToTest.groovy b/src/test/groovy/lang/RespondsToTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/RespondsToTest.groovy
rename to src/test/groovy/lang/RespondsToTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptCacheTest.groovy b/src/test/groovy/lang/ScriptCacheTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptCacheTest.groovy
rename to src/test/groovy/lang/ScriptCacheTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptIntegerDivideTest.java b/src/test/groovy/lang/ScriptIntegerDivideTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptIntegerDivideTest.java
rename to src/test/groovy/lang/ScriptIntegerDivideTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptPrintTest.java b/src/test/groovy/lang/ScriptPrintTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptPrintTest.java
rename to src/test/groovy/lang/ScriptPrintTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy b/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
rename to src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptTest.java b/src/test/groovy/lang/ScriptTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ScriptTest.java
rename to src/test/groovy/lang/ScriptTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/SequenceTest.java b/src/test/groovy/lang/SequenceTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/SequenceTest.java
rename to src/test/groovy/lang/SequenceTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ShortRangeTest.java b/src/test/groovy/lang/ShortRangeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/ShortRangeTest.java
rename to src/test/groovy/lang/ShortRangeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/StringConcatTest.groovy b/src/test/groovy/lang/StringConcatTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/StringConcatTest.groovy
rename to src/test/groovy/lang/StringConcatTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/StripMarginTest.groovy b/src/test/groovy/lang/StripMarginTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/StripMarginTest.groovy
rename to src/test/groovy/lang/StripMarginTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/SyntheticReturnTest.groovy b/src/test/groovy/lang/SyntheticReturnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/SyntheticReturnTest.groovy
rename to src/test/groovy/lang/SyntheticReturnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/TupleTest.java b/src/test/groovy/lang/TupleTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/TupleTest.java
rename to src/test/groovy/lang/TupleTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/WithMethodTest.groovy b/src/test/groovy/lang/WithMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/WithMethodTest.groovy
rename to src/test/groovy/lang/WithMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/DeadlockBugUtil.groovy b/src/test/groovy/lang/gcldeadlock/DeadlockBugUtil.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/DeadlockBugUtil.groovy
rename to src/test/groovy/lang/gcldeadlock/DeadlockBugUtil.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/GroovyClassLoaderDeadlockTest.java b/src/test/groovy/lang/gcldeadlock/GroovyClassLoaderDeadlockTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/GroovyClassLoaderDeadlockTest.java
rename to src/test/groovy/lang/gcldeadlock/GroovyClassLoaderDeadlockTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/script0.groovy b/src/test/groovy/lang/gcldeadlock/script0.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/script0.groovy
rename to src/test/groovy/lang/gcldeadlock/script0.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/script1.groovy b/src/test/groovy/lang/gcldeadlock/script1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/lang/gcldeadlock/script1.groovy
rename to src/test/groovy/lang/gcldeadlock/script1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/example/CheeseSlicer.groovy b/src/test/groovy/mock/example/CheeseSlicer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/example/CheeseSlicer.groovy
rename to src/test/groovy/mock/example/CheeseSlicer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/example/SandwichMaker.groovy b/src/test/groovy/mock/example/SandwichMaker.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/example/SandwichMaker.groovy
rename to src/test/groovy/mock/example/SandwichMaker.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/example/SandwichMakerTest.groovy b/src/test/groovy/mock/example/SandwichMakerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/example/SandwichMakerTest.groovy
rename to src/test/groovy/mock/example/SandwichMakerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/Caller.groovy b/src/test/groovy/mock/interceptor/Caller.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/Caller.groovy
rename to src/test/groovy/mock/interceptor/Caller.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/Collaborator.groovy b/src/test/groovy/mock/interceptor/Collaborator.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/Collaborator.groovy
rename to src/test/groovy/mock/interceptor/Collaborator.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/HalfMockTest.groovy b/src/test/groovy/mock/interceptor/HalfMockTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/HalfMockTest.groovy
rename to src/test/groovy/mock/interceptor/HalfMockTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/IteratorCounter.java b/src/test/groovy/mock/interceptor/IteratorCounter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/IteratorCounter.java
rename to src/test/groovy/mock/interceptor/IteratorCounter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy b/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy
rename to src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockForJavaTest.groovy b/src/test/groovy/mock/interceptor/MockForJavaTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockForJavaTest.groovy
rename to src/test/groovy/mock/interceptor/MockForJavaTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy b/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy
rename to src/test/groovy/mock/interceptor/MockNestedCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy b/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
rename to src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy b/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy
rename to src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy b/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
rename to src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubForJavaTest.groovy b/src/test/groovy/mock/interceptor/StubForJavaTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubForJavaTest.groovy
rename to src/test/groovy/mock/interceptor/StubForJavaTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy b/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
rename to src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubTest.groovy b/src/test/groovy/mock/interceptor/StubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/mock/interceptor/StubTest.groovy
rename to src/test/groovy/mock/interceptor/StubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BigDecimalOperatorsTest.groovy b/src/test/groovy/operator/BigDecimalOperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BigDecimalOperatorsTest.groovy
rename to src/test/groovy/operator/BigDecimalOperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BigIntegerOperationsTest.groovy b/src/test/groovy/operator/BigIntegerOperationsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BigIntegerOperationsTest.groovy
rename to src/test/groovy/operator/BigIntegerOperationsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BitwiseOperatorsTest.groovy b/src/test/groovy/operator/BitwiseOperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BitwiseOperatorsTest.groovy
rename to src/test/groovy/operator/BitwiseOperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BooleanOperationsTest.groovy b/src/test/groovy/operator/BooleanOperationsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/BooleanOperationsTest.groovy
rename to src/test/groovy/operator/BooleanOperationsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/DoubleOperationTest.groovy b/src/test/groovy/operator/DoubleOperationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/DoubleOperationTest.groovy
rename to src/test/groovy/operator/DoubleOperationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/IntegerOperatorsTest.groovy b/src/test/groovy/operator/IntegerOperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/IntegerOperatorsTest.groovy
rename to src/test/groovy/operator/IntegerOperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/MyColor.groovy b/src/test/groovy/operator/MyColor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/MyColor.groovy
rename to src/test/groovy/operator/MyColor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/MyColorCategory.groovy b/src/test/groovy/operator/MyColorCategory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/MyColorCategory.groovy
rename to src/test/groovy/operator/MyColorCategory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/MyColorOperatorOverloadingTest.groovy b/src/test/groovy/operator/MyColorOperatorOverloadingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/MyColorOperatorOverloadingTest.groovy
rename to src/test/groovy/operator/MyColorOperatorOverloadingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/NegateListsTest.groovy b/src/test/groovy/operator/NegateListsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/NegateListsTest.groovy
rename to src/test/groovy/operator/NegateListsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/PowerOperatorsTest.groovy b/src/test/groovy/operator/PowerOperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/PowerOperatorsTest.groovy
rename to src/test/groovy/operator/PowerOperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/SpreadListOperatorTest.groovy b/src/test/groovy/operator/SpreadListOperatorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/SpreadListOperatorTest.groovy
rename to src/test/groovy/operator/SpreadListOperatorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/SpreadMapOperatorTest.groovy b/src/test/groovy/operator/SpreadMapOperatorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/SpreadMapOperatorTest.groovy
rename to src/test/groovy/operator/SpreadMapOperatorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/StringOperatorsTest.groovy b/src/test/groovy/operator/StringOperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/StringOperatorsTest.groovy
rename to src/test/groovy/operator/StringOperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/TernaryOperatorsTest.groovy b/src/test/groovy/operator/TernaryOperatorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/TernaryOperatorsTest.groovy
rename to src/test/groovy/operator/TernaryOperatorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/UnaryMinusNumberTests.groovy b/src/test/groovy/operator/UnaryMinusNumberTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/UnaryMinusNumberTests.groovy
rename to src/test/groovy/operator/UnaryMinusNumberTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/operator/UnaryMinusOperatorTest.groovy b/src/test/groovy/operator/UnaryMinusOperatorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/operator/UnaryMinusOperatorTest.groovy
rename to src/test/groovy/operator/UnaryMinusOperatorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/runtime/metaclass/groovy/bugs/CustomMetaClassTestMetaClass.groovy b/src/test/groovy/runtime/metaclass/groovy/bugs/CustomMetaClassTestMetaClass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/runtime/metaclass/groovy/bugs/CustomMetaClassTestMetaClass.groovy
rename to src/test/groovy/runtime/metaclass/groovy/bugs/CustomMetaClassTestMetaClass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/CallAnotherScript.groovy b/src/test/groovy/script/CallAnotherScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/CallAnotherScript.groovy
rename to src/test/groovy/script/CallAnotherScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/ClassWithScript.groovy b/src/test/groovy/script/ClassWithScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/ClassWithScript.groovy
rename to src/test/groovy/script/ClassWithScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/EvalInScript.groovy b/src/test/groovy/script/EvalInScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/EvalInScript.groovy
rename to src/test/groovy/script/EvalInScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/HelloWorld.groovy b/src/test/groovy/script/HelloWorld.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/HelloWorld.groovy
rename to src/test/groovy/script/HelloWorld.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/HelloWorld2.groovy b/src/test/groovy/script/HelloWorld2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/HelloWorld2.groovy
rename to src/test/groovy/script/HelloWorld2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/MethodTestScript.groovy b/src/test/groovy/script/MethodTestScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/MethodTestScript.groovy
rename to src/test/groovy/script/MethodTestScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/PackageScript.groovy b/src/test/groovy/script/PackageScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/PackageScript.groovy
rename to src/test/groovy/script/PackageScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/ScriptTest.groovy b/src/test/groovy/script/ScriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/ScriptTest.groovy
rename to src/test/groovy/script/ScriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/ScriptWithFunctions.groovy b/src/test/groovy/script/ScriptWithFunctions.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/ScriptWithFunctions.groovy
rename to src/test/groovy/script/ScriptWithFunctions.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/ShowArgs.groovy b/src/test/groovy/script/ShowArgs.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/ShowArgs.groovy
rename to src/test/groovy/script/ShowArgs.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/StreamClassloaderInScriptTest.groovy b/src/test/groovy/script/StreamClassloaderInScriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/StreamClassloaderInScriptTest.groovy
rename to src/test/groovy/script/StreamClassloaderInScriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/script/UseClosureInScript.groovy b/src/test/groovy/script/UseClosureInScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/script/UseClosureInScript.groovy
rename to src/test/groovy/script/UseClosureInScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/security/RunOneGroovyScript.java b/src/test/groovy/security/RunOneGroovyScript.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/security/RunOneGroovyScript.java
rename to src/test/groovy/security/RunOneGroovyScript.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/security/SecurityTest.java b/src/test/groovy/security/SecurityTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/security/SecurityTest.java
rename to src/test/groovy/security/SecurityTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/security/SecurityTestSupport.java b/src/test/groovy/security/SecurityTestSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/security/SecurityTestSupport.java
rename to src/test/groovy/security/SecurityTestSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/security/SignedJarTest.java b/src/test/groovy/security/SignedJarTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/security/SignedJarTest.java
rename to src/test/groovy/security/SignedJarTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/security/forbiddenCodeBase.gvy b/src/test/groovy/security/forbiddenCodeBase.gvy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/security/forbiddenCodeBase.gvy
rename to src/test/groovy/security/forbiddenCodeBase.gvy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/time/DurationTest.groovy b/src/test/groovy/time/DurationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/time/DurationTest.groovy
rename to src/test/groovy/time/DurationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/time/TimeCategoryTest.groovy b/src/test/groovy/time/TimeCategoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/time/TimeCategoryTest.groovy
rename to src/test/groovy/time/TimeCategoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/AnnotationCollectorTest.groovy b/src/test/groovy/transform/AnnotationCollectorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/AnnotationCollectorTest.groovy
rename to src/test/groovy/transform/AnnotationCollectorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/ConditionalInterruptTest.groovy b/src/test/groovy/transform/ConditionalInterruptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/ConditionalInterruptTest.groovy
rename to src/test/groovy/transform/ConditionalInterruptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/LazyTest.groovy b/src/test/groovy/transform/LazyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/LazyTest.groovy
rename to src/test/groovy/transform/LazyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/ReadWriteLockTest.groovy b/src/test/groovy/transform/ReadWriteLockTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/ReadWriteLockTest.groovy
rename to src/test/groovy/transform/ReadWriteLockTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/ThreadInterruptTest.groovy b/src/test/groovy/transform/ThreadInterruptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/ThreadInterruptTest.groovy
rename to src/test/groovy/transform/ThreadInterruptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/TimedInterruptTest.groovy b/src/test/groovy/transform/TimedInterruptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/TimedInterruptTest.groovy
rename to src/test/groovy/transform/TimedInterruptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy b/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy
rename to src/test/groovy/transform/stc/AnonymousInnerClassSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ArraysAndCollectionsSTCTest.groovy b/src/test/groovy/transform/stc/ArraysAndCollectionsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ArraysAndCollectionsSTCTest.groovy
rename to src/test/groovy/transform/stc/ArraysAndCollectionsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/BugsSTCTest.groovy b/src/test/groovy/transform/stc/BugsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/BugsSTCTest.groovy
rename to src/test/groovy/transform/stc/BugsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/CategoriesSTCTest.groovy b/src/test/groovy/transform/stc/CategoriesSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/CategoriesSTCTest.groovy
rename to src/test/groovy/transform/stc/CategoriesSTCTest.groovy
diff --git a/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy
new file mode 100644
index 0000000..63bc0b4
--- /dev/null
+++ b/src/test/groovy/transform/stc/ClosureParamTypeInferenceSTCTest.groovy
@@ -0,0 +1,1222 @@
+/*
+ * Copyright 2003-2013 the original author or authors.
+ *
+ * Licensed under the Apaarraylisstringsicense");
+ * you may not use this file except in comparraylistOfStringsicense.
+ * Ystringshe License at
+ *
+ * arraylistOfStringse.org/licenses/LICENSE-2.0
+ *
+ * Unless required by apstrings in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package groovy.transform.stc
+
+import groovy.transform.NotYetImplemented
+
+/**
+ * Unit tests for static type checking : closure parameter type inference.
+ *
+ * @author Cedric Champeau
+ */
+class ClosureParamTypeInferenceSTCTest extends StaticTypeCheckingTestCase {
+ void testInferenceForDGM_CollectUsingExplicitIt() {
+ assertScript '''
+ ['a','b'].collect { it -> it.toUpperCase() }
+ '''
+ }
+
+ void testInferenceForDGM_CollectUsingExplicitItAndIncorrectType() {
+ shouldFailWithMessages '''
+ ['a','b'].collect { Date it -> it.toUpperCase() }
+ ''', 'Expected parameter of type java.lang.String but got java.util.Date'
+ }
+
+ void testInferenceForDGM_CollectUsingImplicitIt() {
+ assertScript '''
+ ['a','b'].collect { it.toUpperCase() }
+ '''
+ }
+
+ void testInferenceForDGM_eachUsingExplicitIt() {
+ assertScript '''
+ ['a','b'].each { it -> it.toUpperCase() }
+ '''
+ }
+
+ void testInferenceForDGM_eachUsingImplicitIt() {
+ assertScript '''
+ ['a','b'].each { it.toUpperCase() }
+ '''
+ }
+
+ void testInferenceForDGM_CollectUsingImplicitItAndLUB() {
+ assertScript '''
+ assert [1234, 3.14].collect { it.intValue() } == [1234,3]
+ '''
+ }
+
+ void testInferenceForDGM_countUsingFirstSignature() {
+ assertScript '''
+ def src = [a: 1, b:2, c:3]
+ assert src.count { k,v -> v>1 } == 2
+ '''
+ }
+
+ void testInferenceForDGM_countUsingSecondSignature() {
+ assertScript '''
+ def src = [a: 1, b:2, c:3]
+ assert src.count { e -> e.value>1 } == 2
+ '''
+ }
+
+ void testInferenceForDGM_countUsingSecondSignatureAndImplicitIt() {
+ assertScript '''
+ def src = [a: 1, b:2, c:3]
+ assert src.count { it.value>1 } == 2
+ '''
+ }
+
+ void testInferenceForDGM_collectManyUsingFirstSignature() {
+ assertScript '''
+def map = [bread:3, milk:5, butter:2]
+def result = map.collectMany{ k, v -> k.startsWith('b') ? k.toList() : [] }
+assert result == ['b', 'r', 'e', 'a', 'd', 'b', 'u', 't', 't', 'e', 'r']
+'''
+ }
+
+ void testInferenceForDGM_collectManyUsingSecondSignature() {
+ assertScript '''
+def map = [bread:3, milk:5, butter:2]
+def result = map.collectMany{ e -> e.key.startsWith('b') ? e.key.toList() : [] }
+assert result == ['b', 'r', 'e', 'a', 'd', 'b', 'u', 't', 't', 'e', 'r']
+'''
+ }
+
+ void testInferenceForDGM_collectManyUsingSecondSignatureAndImplicitIt() {
+ assertScript '''
+def map = [bread:3, milk:5, butter:2]
+def result = map.collectMany{ it.key.startsWith('b') ? it.key.toList() : [] }
+assert result == ['b', 'r', 'e', 'a', 'd', 'b', 'u', 't', 't', 'e', 'r']
+'''
+ }
+
+ void testInferenceForDGM_Collect2() {
+ assertScript '''
+def items = []
+['a','b','c'].collect(items) { it.toUpperCase() }
+'''
+ }
+
+ void testInferenceForDGM_CollectMap() {
+ assertScript '''
+ assert [a: 'foo',b:'bar'].collect { k,v -> k+v } == ['afoo','bbar']
+ assert [a: 'foo',b:'bar'].collect { e -> e.key+e.value } == ['afoo','bbar']
+ assert [a: 'foo',b:'bar'].collect { it.key+it.value } == ['afoo','bbar']
+'''
+ }
+
+ void testInferenceForDGM_CollectMapWithCollection() {
+ assertScript '''
+ assert [a: 'foo',b:'bar'].collect([]) { k,v -> k+v } == ['afoo','bbar']
+ assert [a: 'foo',b:'bar'].collect([]) { e -> e.key+e.value } == ['afoo','bbar']
+ assert [a: 'foo',b:'bar'].collect([]) { it.key+it.value } == ['afoo','bbar']
+'''
+ }
+
+ void testInferenceForDGM_collectEntries() {
+ assertScript '''
+ assert ['a','b','c'].collectEntries { [it, it.toUpperCase() ]} == [a:'A',b:'B',c:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesWithCollector() {
+ assertScript '''
+ assert ['a','b','c'].collectEntries([:]) { [it, it.toUpperCase() ]} == [a:'A',b:'B',c:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesIterator() {
+ assertScript '''
+ assert ['a','b','c'].iterator().collectEntries { [it, it.toUpperCase() ]} == [a:'A',b:'B',c:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesIteratorWithCollector() {
+ assertScript '''
+ assert ['a','b','c'].iterator().collectEntries([:]) { [it, it.toUpperCase() ]} == [a:'A',b:'B',c:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesOnMap() {
+ assertScript '''
+ assert [a:'a',b:'b',c:'c'].collectEntries { k,v -> [k+k, v.toUpperCase() ]} == [aa:'A',bb:'B',cc:'C']
+ assert [a:'a',b:'b',c:'c'].collectEntries { e -> [e.key+e.key, e.value.toUpperCase() ]} == [aa:'A',bb:'B',cc:'C']
+ assert [a:'a',b:'b',c:'c'].collectEntries { [it.key+it.key, it.value.toUpperCase() ]} == [aa:'A',bb:'B',cc:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesOnMapWithCollector() {
+ assertScript '''
+ assert [a:'a',b:'b',c:'c'].collectEntries([:]) { k,v -> [k+k, v.toUpperCase() ]} == [aa:'A',bb:'B',cc:'C']
+ assert [a:'a',b:'b',c:'c'].collectEntries([:]) { e -> [e.key+e.key, e.value.toUpperCase() ]} == [aa:'A',bb:'B',cc:'C']
+ assert [a:'a',b:'b',c:'c'].collectEntries([:]) { [it.key+it.key, it.value.toUpperCase() ]} == [aa:'A',bb:'B',cc:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesOnArray() {
+ assertScript '''
+ String[] array = ['a','b','c']
+ assert array.collectEntries { [it, it.toUpperCase() ]} == [a:'A',b:'B',c:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectEntriesOnArrayWithCollector() {
+ assertScript '''
+ String[] array = ['a','b','c']
+ assert array.collectEntries([:]) { [it, it.toUpperCase() ]} == [a:'A',b:'B',c:'C']
+'''
+ }
+
+ void testInferenceForDGM_collectManyOnIterable() {
+ assertScript '''
+ assert (0..5).collectMany { [it, 2*it ]} == [0,0,1,2,2,4,3,6,4,8,5,10]
+'''
+ }
+
+ void testInferenceForDGM_collectManyOnIterator() {
+ assertScript '''
+ assert (0..5).iterator().collectMany { [it, 2*it ]} == [0,0,1,2,2,4,3,6,4,8,5,10]
+'''
+ }
+
+ void testInferenceForDGM_collectManyOnIterableWithCollector() {
+ assertScript '''
+ assert (0..5).collectMany([]) { [it, 2*it ]} == [0,0,1,2,2,4,3,6,4,8,5,10]
+'''
+ }
+
+ void testInferenceForDGM_collectManyOnMap() {
+ assertScript '''
+ assert [a:0,b:1,c:2].collectMany { k,v -> [v, 2*v ]} == [0,0,1,2,2,4]
+ assert [a:0,b:1,c:2].collectMany { e -> [e.value, 2*e.value ]} == [0,0,1,2,2,4]
+ assert [a:0,b:1,c:2].collectMany { [it.value, 2*it.value ]} == [0,0,1,2,2,4]
+'''
+ }
+
+ void testInferenceForDGM_collectManyOnMapWithCollector() {
+ assertScript '''
+ assert [a:0,b:1,c:2].collectMany([]) { k,v -> [v, 2*v ]} == [0,0,1,2,2,4]
+ assert [a:0,b:1,c:2].collectMany([]) { e -> [e.value, 2*e.value ]} == [0,0,1,2,2,4]
+ assert [a:0,b:1,c:2].collectMany([]) { [it.value, 2*it.value ]} == [0,0,1,2,2,4]
+'''
+ }
+
+ void testInferenceForDGM_collectManyOnArray() {
+ assertScript '''
+ Integer[] arr = (0..5) as Integer[]
+ assert arr.collectMany { [it, 2*it ]} == [0,0,1,2,2,4,3,6,4,8,5,10]
+'''
+ }
+
+ void testInferenceOnNonExtensionMethod() {
+ assertScript '''import groovy.transform.stc.ClosureParams
+ import groovy.transform.stc.FirstParam
+ public <T> T foo(T arg, @ClosureParams(FirstParam) Closure c) { c.call(arg) }
+ assert foo('a') { it.toUpperCase() } == 'A'
+'''
+ }
+
+ void testFromStringWithSimpleType() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+void foo(@ClosureParams(value=FromString,options="java.lang.String") Closure cl) { cl.call('foo') }
+foo { String str -> println str.toUpperCase()}
+'''
+
+ shouldFailWithMessages '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+void foo(@ClosureParams(value=FromString,options="java.lang.String") Closure cl) { cl.call('foo') }
+foo { Date str -> println str}
+''', 'Expected parameter of type java.lang.String but got java.util.Date'
+ }
+
+ void testFromStringWithGenericType() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+void foo(@ClosureParams(value=FromString,options="java.util.List<java.lang.String>") Closure cl) { cl.call(['foo']) }
+foo { List<String> str -> str.each { println it.toUpperCase() } }
+'''
+
+ shouldFailWithMessages '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+void foo(@ClosureParams(value=FromString,options="java.util.List<java.lang.String>") Closure cl) { cl.call(['foo']) }
+foo { List<Date> d -> d.each { println it } }
+''', 'Expected parameter of type java.util.List <java.lang.String> but got java.util.List <Date>'
+ }
+
+ void testFromStringWithDirectGenericPlaceholder() {
+
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+public <T> void foo(T t, @ClosureParams(value=FromString,options="T") Closure cl) { cl.call(t) }
+foo('hey') { println it.toUpperCase() }
+'''
+
+ }
+
+ void testFromStringWithGenericPlaceholder() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+public <T> void foo(T t, @ClosureParams(value=FromString,options="java.util.List<T>") Closure cl) { cl.call([t,t]) }
+foo('hey') { List<String> str -> str.each { println it.toUpperCase() } }
+'''
+
+ }
+
+ void testFromStringWithGenericPlaceholderFromClass() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo<T> {
+ public void foo(@ClosureParams(value=FromString,options="java.util.List<T>") Closure cl) { cl.call(['hey','ya']) }
+ }
+ def foo = new Foo<String>()
+
+ foo.foo { List<String> str -> str.each { println it.toUpperCase() } }
+'''
+ }
+
+ void testFromStringWithGenericPlaceholderFromClassWithTwoGenerics() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo<T,U> {
+ public void foo(@ClosureParams(value=FromString,options="java.util.List<U>") Closure cl) { cl.call(['hey','ya']) }
+ }
+ def foo = new Foo<Integer,String>()
+
+ foo.foo { List<String> str -> str.each { println it.toUpperCase() } }
+'''
+ }
+
+ void testFromStringWithGenericPlaceholderFromClassWithTwoGenericsAndNoExplicitSignature() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo<T,U> {
+ public void foo(@ClosureParams(value=FromString,options="java.util.List<U>") Closure cl) { cl.call(['hey','ya']) }
+ }
+ def foo = new Foo<Integer,String>()
+
+ foo.foo { it.each { println it.toUpperCase() } }
+'''
+ }
+
+ void testFromStringWithGenericPlaceholderFromClassWithTwoGenericsAndNoExplicitSignatureAndNoFQN() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo<T,U> {
+ public void foo(@ClosureParams(value=FromString,options="List<U>") Closure cl) { cl.call(['hey','ya']) }
+ }
+ def foo = new Foo<Integer,String>()
+
+ foo.foo { it.each { println it.toUpperCase() } }
+'''
+ }
+
+ void testFromStringWithGenericPlaceholderFromClassWithTwoGenericsAndNoExplicitSignatureAndNoFQNAndReferenceToSameUnitClass() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo {
+ void bar() {
+ println 'Haha!'
+ }
+ }
+
+ class Tor<D,U> {
+ public void foo(@ClosureParams(value=FromString,options="List<U>") Closure cl) { cl.call([new Foo(), new Foo()]) }
+ }
+ def tor = new Tor<Integer,Foo>()
+
+ tor.foo { it.each { it.bar() } }
+'''
+ }
+
+ void testFromStringWithGenericPlaceholderFromClassWithTwoGenericsAndNoExplicitSignatureAndNoFQNAndReferenceToSameUnitClassAndTwoArgs() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo {
+ void bar() {
+ println 'Haha!'
+ }
+ }
+
+ class Tor<D,U> {
+ public void foo(@ClosureParams(value=FromString,options=["D,List<U>"]) Closure cl) { cl.call(3, [new Foo(), new Foo()]) }
+ }
+ def tor = new Tor<Integer,Foo>()
+
+ tor.foo { r, e -> r.times { e.each { it.bar() } } }
+'''
+ }
+
+ void testFromStringWithGenericPlaceholderFromClassWithTwoGenericsAndPolymorphicSignature() {
+ assertScript '''import groovy.transform.stc.FromString
+import groovy.transform.stc.ClosureParams
+
+ class Foo {
+ void bar() {
+ println 'Haha!'
+ }
+ }
+
+ class Tor<D,U> {
+ public void foo(@ClosureParams(value=FromString,options=["D,List<U>", "D"]) Closure cl) {
+ if (cl.maximumNumberOfParameters==2) {
+ cl.call(3, [new Foo(), new Foo()])
+ } else {
+ cl.call(3)
+ }
+ }
+ }
+ def tor = new Tor<Integer,Foo>()
+
+ tor.foo { r, e -> r.times { e.each { it.bar() } } }
+ tor.foo { it.times { println 'polymorphic' } }
+'''
+ }
+
+ void testStringGroovyMethodsFindMethodWithVargs() {
+ assertScript '''
+ "75001 Paris".find(/(\\d{5}\\s(\\w+))/) { all, zip, city -> println all.toUpperCase() }
+'''
+
+ assertScript '''
+ "75001 Paris".find(/(\\d{5}\\s(\\w+))/) { String all, String zip, String city -> println all.toUpperCase() }
+'''
+ shouldFailWithMessages '''
+ "75001 Paris".find(/(\\d{5}\\s(\\w+))/) { String all, Date zip, String city -> println all.toUpperCase() }
+''', 'Expected parameter of type java.lang.String but got java.util.Date'
+ }
+
+ void testInferenceForDGM_countIterableOrIterator() {
+ assertScript '''
+ assert ['Groovy','Java'].count { it.length() > 4 } == 1
+ '''
+ assertScript '''
+ assert ['Groovy','Java'].iterator().count { it.length() > 4 } == 1
+ '''
+ }
+
+ void testInferenceForDGM_countMap() {
+ assertScript '''
+ assert [G:'Groovy',J:'Java'].count { k,v -> v.length() > 4 } == 1
+ assert [G:'Groovy',J:'Java'].count { e -> e.value.length() > 4 } == 1
+ assert [G:'Groovy',J:'Java'].count { it.value.length() > 4 } == 1
+ '''
+ }
+
+ void testInferenceForDGM_countArray() {
+ assertScript '''
+ String[] array = ['Groovy','Java']
+ assert array.count { it.length() > 4 } == 1
+ '''
+ }
+
+ void testInferenceForDGM_countBy() {
+ assertScript '''
+ assert ['Groovy','yvoorG'].countBy { it.length() } == [6:2]
+ '''
+ assertScript '''
+ assert ['Groovy','yvoorG'].iterator().countBy { it.length() } == [6:2]
+ '''
+ }
+ void testInferenceForDGM_countByArray() {
+ assertScript '''
+ String[] array = ['Groovy','yvoorG']
+ assert array.countBy { it.length() } == [6:2]
+ '''
+ }
+ void testInferenceForDGM_countByMap() {
+ assertScript '''
+ assert [langs:['Groovy','Java']].countBy { k,v -> k.length() } == [5:1]
+ assert [langs:['Groovy','Java']].countBy { e -> e.key.length() } == [5:1]
+ assert [langs:['Groovy','Java']].countBy { it.key.length() } == [5:1]
+ '''
+ }
+
+ void testInferenceForDGM_downto() {
+ assertScript '''
+ BigDecimal sum = 0
+ 10.0.downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ BigInteger sum = 0
+ 10G.downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ double sum = 0
+ 10d.downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ Double sum = 0
+ new Double(10).downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ float sum = 0
+ 10f.downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ Float sum = 0
+ new Float(10).downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ long sum = 0
+ 10L.downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ Long sum = 0
+ new Long(10).downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ def sum = 0
+ new Byte((byte)10).downto(0) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ }
+
+ void testInferenceForDGM_upto() {
+ assertScript '''
+ BigDecimal sum = 0
+ 0.0.upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ BigInteger sum = 0
+ 0G.upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ double sum = 0
+ 0d.upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ Double sum = 0
+ new Double(0).upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ float sum = 0
+ 0f.upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ Float sum = 0
+ new Float(0).upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ long sum = 0
+ 0L.upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ Long sum = 0
+ new Long(0).upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ assertScript '''
+ def sum = 0
+ new Byte((byte)0).upto(10) {
+ sum += 2*it
+ }
+ assert sum == 110
+ '''
+ }
+
+ void testInferenceForDGM_dropWhileOnIterable() {
+ assertScript '''
+ assert (0..10).dropWhile { it<5 } == (5..10)
+ assert (0..10).dropWhile { int i -> i<5 } == (5..10)
+ '''
+ }
+
+ void testInferenceForDGM_dropWhileOnList() {
+ assertScript '''
+ assert [0,1,2,3,4,5,6,7,8,9,10].dropWhile { it<5 } == [5,6,7,8,9,10]
+ assert [0,1,2,3,4,5,6,7,8,9,10].dropWhile { int i -> i<5 } == [5,6,7,8,9,10]
+ '''
+ }
+
+ void testInferenceForDGM_dropWhileOnIterator() {
+ assertScript '''
+ assert [0,1,2,3,4,5,6,7,8,9,10].iterator().dropWhile { it<5 } as List == [5,6,7,8,9,10]
+ assert [0,1,2,3,4,5,6,7,8,9,10].iterator().dropWhile { int i -> i<5 } as List == [5,6,7,8,9,10]
+ '''
+ }
+
+ void testInferenceForDGM_dropWhileOnArray() {
+ assertScript '''
+ Integer[] array = [0,1,2,3,4,5,6,7,8,9,10]
+ assert array.iterator().dropWhile { it<5 } as List == [5,6,7,8,9,10]
+ assert array.iterator().dropWhile { int i -> i<5 } as List == [5,6,7,8,9,10]
+ '''
+ }
+
+ void testInferenceForDGM_eachByte() {
+ assertScript '''
+ byte[] array = new byte[0]
+ array.eachByte { byte b -> b.intValue() }
+ array.eachByte { it.intValue() }
+ '''
+ assertScript '''
+ Byte[] array = new Byte[0]
+ array.eachByte { Byte b -> b.intValue() }
+ array.eachByte { it.intValue() }
+ '''
+ }
+
+ void testInferenceForEachWithIndexOnMap() {
+ assertScript '''
+ [a:'A',bb:'B',ccc:'C'].eachWithIndex { k,v,i -> assert k.toUpperCase() == v*(1+i) }
+ [a:'A',bb:'B',ccc:'C'].eachWithIndex { e,i -> assert e.key.toUpperCase() == e.value*(1+i) }
+ '''
+ }
+ void testInferenceForEachWithIndexOnIterable() {
+ assertScript '''
+ ['1','2','3'].eachWithIndex { e,i -> assert e.toUpperCase() == String.valueOf(1+i) }
+ '''
+ }
+ void testInferenceForEachWithIndexOnIterator() {
+ assertScript '''
+ ['1','2','3'].iterator().eachWithIndex { e,i -> assert e.toUpperCase() == String.valueOf(1+i) }
+ '''
+ }
+
+ void testInferenceForDGM_everyOnMap() {
+ assertScript '''
+ assert [a:'A',b:'B',cc:'CC'].every { String k, String v -> k == v.toLowerCase() }
+ assert [a:'A',b:'B',cc:'CC'].every { k, v -> k == v.toLowerCase() }
+ assert [a:'A',b:'B',cc:'CC'].every { e -> e.key == e.value.toLowerCase() }
+ assert [a:'A',b:'B',cc:'CC'].every { it.key == it.value.toLowerCase() }
+ '''
+ }
+ void testInferenceForDGM_everyOnIterable() {
+ assertScript '''
+ assert ['foo','bar','baz'].every { String it -> it.length() == 3 }
+ assert ['foo','bar','baz'].every { it -> it.length() == 3 }
+ assert ['foo','bar','baz'].every { it.length() == 3 }
+ '''
+ }
+ void testInferenceForDGM_everyOnIterator() {
+ assertScript '''
+ assert ['foo','bar','baz'].iterator().every { String it -> it.length() == 3 }
+ assert ['foo','bar','baz'].iterator().every { it -> it.length() == 3 }
+ assert ['foo','bar','baz'].iterator().every { it.length() == 3 }
+ '''
+ }
+
+ void testInferenceForDGM_findOnCollection() {
+ assertScript '''
+ assert ['a','bbb','ccc'].find { String it -> it.length() == 3 } == 'bbb'
+ assert ['a','bbb','ccc'].find { it -> it.length() == 3 } == 'bbb'
+ assert ['a','bbb','ccc'].find { it.length() == 3 } == 'bbb'
+ '''
+ }
+ void testInferenceForDGM_findOnArray() {
+ assertScript '''
+ String[] arraylistOfStrings = ['a','bbb','ccc']
+ assert arraylistOfStrings.find { String it -> it.length() == 3 } == 'bbb'
+ assert arraylistOfStrings.find { it -> it.length() == 3 } == 'bbb'
+ assert arraylistOfStrings.find { it.length() == 3 } == 'bbb'
+ '''
+ }
+ void testInferenceForDGM_findOnMap() {
+ assertScript '''
+ assert [a:2,b:4,c:6].find { String k, int v -> k.toUpperCase()=='C' && 2*v==12 } instanceof Map.Entry
+ assert [a:2,b:4,c:6].find { k, v -> k.toUpperCase()=='C' && 2*v==12 } instanceof Map.Entry
+ assert [a:2,b:4,c:6].find { e -> e.key.toUpperCase()=='C' && 2*e.value==12 } instanceof Map.Entry
+ assert [a:2,b:4,c:6].find { it.key.toUpperCase()=='C' && 2*it.value==12 } instanceof Map.Entry
+ '''
+ }
+
+ void testInferenceForDGM_findAllOnCollection() {
+ assertScript '''
+ assert ['a','bbb','ccc'].findAll { String it -> it.length() == 3 } == ['bbb','ccc']
+ assert ['a','bbb','ccc'].findAll { it -> it.length() == 3 } == ['bbb','ccc']
+ assert ['a','bbb','ccc'].findAll { it.length() == 3 } == ['bbb','ccc']
+ '''
+ }
+ void testInferenceForDGM_findAllOnArray() {
+ assertScript '''
+ String[] arraylistOfStrings = ['a','bbb','ccc']
+ assert arraylistOfStrings.findAll { String it -> it.length() == 3 } == ['bbb','ccc']
+ assert arraylistOfStrings.findAll { it -> it.length() == 3 } == ['bbb','ccc']
+ assert arraylistOfStrings.findAll { it.length() == 3 } == ['bbb','ccc']
+ '''
+ }
+ void testInferenceForDGM_findAllOnMap() {
+ assertScript '''
+ assert [a:2,b:4,c:6].findAll { String k, int v -> k.toUpperCase()=='C' && 2*v==12 } == [c:6]
+ assert [a:2,b:4,c:6].findAll { k, v -> k.toUpperCase()=='C' && 2*v==12 } == [c:6]
+ assert [a:2,b:4,c:6].findAll { e -> e.key.toUpperCase()=='C' && 2*e.value==12 } == [c:6]
+ assert [a:2,b:4,c:6].findAll { it.key.toUpperCase()=='C' && 2*it.value==12 } == [c:6]
+ '''
+ }
+
+ void testInferenceForDGM_findResultOnCollection() {
+ assertScript '''
+ assert ['barbar','barbaz','foo'].findResult { it.length() == 3?it.toUpperCase():null } == 'FOO'
+ assert ['barbar','barbaz','foo'].findResult { String it -> it.length() == 3?it.toUpperCase():null } == 'FOO'
+ assert ['barbar','barbaz','foo'].findResult { it -> it.length() == 3?it.toUpperCase():null } == 'FOO'
+ assert ['barbar','barbaz','foo'].findResult(-1) { it.length() == 4?it.toUpperCase():null } == -1
+ assert ['barbar','barbaz','foo'].findResult(-1) { String it -> it.length() == 4?it.toUpperCase():null } == -1
+ assert ['barbar','barbaz','foo'].findResult(-1) { it -> it.length() == 4?it.toUpperCase():null } == -1
+ '''
+ }
+ void testInferenceForDGM_findResultOnIterable() {
+ assertScript '''
+ assert (0..10).findResult { it== 3?2*it:null } == 6
+ assert (0..10).findResult { int it -> it==3?2*it:null } == 6
+ assert (0..10).findResult { it -> it==3?2*it:null } == 6
+ '''
+ }
+ void testInferenceForDGM_findResultOnMap() {
+ assertScript '''
+ assert [a:1, b:2, c:3].findResult { String k, int v -> "${k.toUpperCase()}$v"=='C3'?2*v:null } == 6
+ assert [a:1, b:2, c:3].findResult { k, v -> "${k.toUpperCase()}$v"=='C3'?2*v:null } == 6
+ assert [a:1, b:2, c:3].findResult { e -> "${e.key.toUpperCase()}$e.value"=='C3'?2*e.value:null } == 6
+ assert [a:1, b:2, c:3].findResult { "${it.key.toUpperCase()}$it.value"=='C3'?2*it.value:null } == 6
+
+ assert [a:1, b:2, c:3].findResult('a') { String k, int v -> "${k.toUpperCase()}$v"=='C4'?2*v:null } == 'a'
+ assert [a:1, b:2, c:3].findResult('a') { k, v -> "${k.toUpperCase()}$v"=='C4'?2*v:null } == 'a'
+ assert [a:1, b:2, c:3].findResult('a') { e -> "${e.key.toUpperCase()}$e.value"=='C4'?2*e.value:null } == 'a'
+ assert [a:1, b:2, c:3].findResult('a') { "${it.key.toUpperCase()}$it.value"=='C4'?2*it.value:null } == 'a'
+ '''
+ }
+
+ void testInferenceForDGM_findResultsOnIterable() {
+ assertScript '''
+ assert (0..10).findResults { it<3?2*it:null } == [0,2,4]
+ assert (0..10).findResults { int it -> it<3?2*it:null } == [0,2,4]
+ assert (0..10).findResults { it -> it<3?2*it:null } == [0,2,4]
+ '''
+ }
+ void testInferenceForDGM_findResultsOnMap() {
+ assertScript '''
+ assert [a:1, b:2, c:3].findResults { String k, int v -> "${k.toUpperCase()}$v"=='C3'?2*v:null } == [6]
+ assert [a:1, b:2, c:3].findResults { k, v -> "${k.toUpperCase()}$v"=='C3'?2*v:null } == [6]
+ assert [a:1, b:2, c:3].findResults { e -> "${e.key.toUpperCase()}$e.value"=='C3'?2*e.value:null } == [6]
+ assert [a:1, b:2, c:3].findResults { "${it.key.toUpperCase()}$it.value"=='C3'?2*it.value:null } == [6]
+ '''
+ }
+
+ void testInferenceForDGM_groupByIterable() {
+ assertScript '''
+ assert ['a','bb','cc','d','eee'].groupBy { it.length() } == [1:['a','d'],2:['bb','cc'],3:['eee']]
+ '''
+ }
+ void testInferenceForDGM_groupByArray() {
+ assertScript '''
+ String[] array = ['a','bb','cc','d','eee']
+ assert array.groupBy { it.length() } == [1:['a','d'],2:['bb','cc'],3:['eee']]
+ '''
+ }
+ void testInferenceForDGM_groupByMap() {
+ assertScript '''
+ assert [a:'1',b:'2',c:'C'].groupBy { e -> e.key.toUpperCase()==e.value?1:0 } == [0:[a:'1',b:'2'], 1:[c:'C']]
+ assert [a:'1',b:'2',c:'C'].groupBy { k, v -> k.toUpperCase()==v?1:0 } == [0:[a:'1',b:'2'], 1:[c:'C']]
+ assert [a:'1',b:'2',c:'C'].groupBy { it.key.toUpperCase()==it.value?1:0 } == [0:[a:'1',b:'2'], 1:[c:'C']]
+ '''
+ }
+ void testInferenceForDGM_groupEntriesBy() {
+ assertScript '''
+ def result = [a:1,b:2,c:3,d:4,e:5,f:6].groupEntriesBy { k,v -> v % 2 }
+ result = [a:1,b:2,c:3,d:4,e:5,f:6].groupEntriesBy { it.value % 2 }
+ result = [a:1,b:2,c:3,d:4,e:5,f:6].groupEntriesBy { e -> e.value % 2 }
+ assert result[0]*.key == ["b", "d", "f"]
+ assert result[1]*.value == [1, 3, 5]
+ '''
+ }
+
+ void testInferenceForDGM_injectOnCollectionWithInitialValue() {
+ assertScript '''
+ assert ['a','bb','ccc'].inject(0) { acc, str -> acc += str.length(); acc } == 6
+ '''
+ }
+
+ void testInferenceForDGM_injectOnArrayWithInitialValue() {
+ assertScript '''
+ String[] array = ['a','bb','ccc']
+ assert array.inject(0) { acc, str -> acc += str.length(); acc } == 6
+ '''
+ }
+
+ void testInferenceForDGM_injectOnIteratorWithInitialValue() {
+ assertScript '''
+ assert ['a','bb','ccc'].iterator().inject(0) { acc, str -> acc += str.length(); acc } == 6
+ '''
+ }
+
+ void testInferenceForDGM_injectOnCollection() {
+ assertScript '''
+ assert ['a','bb','ccc'].inject { acc, str -> acc += str.toUpperCase(); acc } == 'aBBCCC'
+ '''
+ }
+
+ void testInferenceForDGM_injectOnArray() {
+ assertScript '''
+ String[] array = ['a','bb','ccc']
+ assert array.inject { acc, str -> acc += str.toUpperCase(); acc } == 'aBBCCC'
+ '''
+ }
+
+ void testInferenceForDGM_injectOnCollectionWithInitialValueDirect() {
+ assertScript '''import org.codehaus.groovy.runtime.DefaultGroovyMethods as DGM
+ assert DGM.inject(['a','bb','ccc'],0) { acc, str -> acc += str.length(); acc } == 6
+ '''
+ }
+
+ void testInferenceForDGM_injectOnCollectionDirect() {
+ assertScript '''import org.codehaus.groovy.runtime.DefaultGroovyMethods as DGM
+ assert DGM.inject(['a','bb','ccc']) { acc, str -> acc += str.toUpperCase(); acc } == 'aBBCCC'
+ '''
+ }
+
+ void testDGM_injectOnMap() {
+ assertScript '''
+ assert [a:1,b:2].inject(0) { acc, entry -> acc += entry.value; acc} == 3
+ assert [a:1,b:2].inject(0) { acc, k, v -> acc += v; acc} == 3
+ '''
+ }
+
+ void testDGM_max() {
+ assertScript '''
+ assert ['a','abc', 'defg','hi'].max { it.length() } == 'defg'
+ assert ['a','abc', 'defg','hi'].iterator().max { it.length() } == 'defg'
+ assert (['a','abc', 'defg','hi'] as String[]).max { it.length() } == 'defg'
+ '''
+ }
+
+ void testDGM_maxOnMap() {
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].max { a,b -> a.value.length() <=> b.value.length() }
+ assert result.key == 'c'
+ assert result.value == 'defg'
+ '''
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].max { Map.Entry<String,String> a, Map.Entry<String,String> b -> a.value.length() <=> b.value.length() }
+ assert result.key == 'c'
+ assert result.value == 'defg'
+ '''
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].max { e -> e.value.length() }
+ assert result.key == 'c'
+ assert result.value == 'defg'
+ '''
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].max { it.value.length() }
+ assert result.key == 'c'
+ assert result.value == 'defg'
+ '''
+ }
+
+ void testDGM_min() {
+ assertScript '''
+ assert ['a','abc', 'defg','hi'].min { it.length() } == 'a'
+ assert ['a','abc', 'defg','hi'].iterator().min { it.length() } == 'a'
+ assert (['a','abc', 'defg','hi'] as String[]).min { it.length() } == 'a'
+ '''
+ }
+
+ void testDGM_maxOnMin() {
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].min { a,b -> a.value.length() <=> b.value.length() }
+ assert result.key == 'a'
+ assert result.value == 'a'
+ '''
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].min { Map.Entry<String,String> a, Map.Entry<String,String> b -> a.value.length() <=> b.value.length() }
+ assert result.key == 'a'
+ assert result.value == 'a'
+ '''
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].min { e -> e.value.length() }
+ assert result.key == 'a'
+ assert result.value == 'a'
+ '''
+ assertScript '''
+ def result = [a:'a',b:'abc', c:'defg',d:'hi'].min { it.value.length() }
+ assert result.key == 'a'
+ assert result.value == 'a'
+ '''
+ }
+
+ void testDGM_removeAllOnCollection() {
+ assertScript '''
+ def list = ['abc','a','groovy','java']
+ list.removeAll { it.length() <4 }
+ assert list == ['groovy','java']
+ '''
+ }
+ void testDGM_retainAllOnCollection() {
+ assertScript '''
+ def list = ['abc','a','groovy','java']
+ list.retainAll { it.length()>3 }
+ assert list == ['groovy','java']
+ '''
+ }
+
+ void testReverseEachOnList() {
+ assertScript '''
+ ['a','b'].reverseEach { println it.toUpperCase() }
+ '''
+ }
+ void testReverseEachOnArray() {
+ assertScript '''
+ (['a','b'] as String[]).reverseEach { println it.toUpperCase() }
+ '''
+ }
+ void testReverseEachOnMap() {
+ assertScript '''
+ [a:1,b:2].reverseEach { k,v -> println ((k.toUpperCase())*v) }
+ [a:1,b:2].reverseEach { e -> println ((e.key.toUpperCase())*e.value) }
+ [a:1,b:2].reverseEach { println ((it.key.toUpperCase())*it.value) }
+ '''
+ }
+
+ void testDGM_sortOnCollection() {
+ assertScript '''
+ assert ["hi","hey","hello"] == ["hello","hi","hey"].sort { a,b -> a.length() <=> b.length() }
+ assert ["hi","hey","hello"] == ["hello","hi","hey"].sort { str -> str.length() }
+ assert ["hi","hey","hello"] == ["hello","hi","hey"].sort { it.length() }
+ '''
+ }
+ void testDGM_sortOnArray() {
+ assertScript '''
+ String[] array = ["hello","hi","hey"]
+ assert ["hi","hey","hello"] == array.sort { a,b -> a.length() <=> b.length() }
+ assert ["hi","hey","hello"] == array.sort { str -> str.length() }
+ assert ["hi","hey","hello"] == array.sort { it.length() }
+ '''
+ }
+ void testDGM_sortOnIterator() {
+ assertScript '''
+ assert ["hi","hey","hello"] == ["hello","hi","hey"].iterator().sort { a,b -> a.length() <=> b.length() }.collect()
+ assert ["hi","hey","hello"] == ["hello","hi","hey"].iterator().sort { str -> str.length() }.collect()
+ assert ["hi","hey","hello"] == ["hello","hi","hey"].iterator().sort { it.length() }.collect()
+ '''
+ }
+ void testDGM_sortOnIterable() {
+ assertScript '''
+ def foo(Iterable<String> iterable) {
+ assert ["hi","hey","hello"] == iterable.sort { a,b -> a.length() <=> b.length() }
+ assert ["hi","hey","hello"] == iterable.sort { str -> str.length() }
+ assert ["hi","hey","hello"] == iterable.sort { it.length() }
+ }
+ foo(["hello","hi","hey"])
+ '''
+ }
+
+ void testDGM_sortOnMap() {
+ assertScript '''
+ def map = [a:5, b:3, c:6, d:4].sort { a, b -> a.value <=> b.value }
+ assert map == [b:3, d:4, a:5, c:6]
+ '''
+
+ assertScript '''
+ def map = [a:5, b:3, c:6, d:4].sort { a -> a.value }
+ assert map == [b:3, d:4, a:5, c:6]
+ '''
+
+ assertScript '''
+ def map = [a:5, b:3, c:6, d:4].sort { it.value }
+ assert map == [b:3, d:4, a:5, c:6]
+ '''
+ }
+
+ void testDGM_slitOnCollection() {
+ assertScript '''
+ assert [[2,4],[1,3]] == [1,2,3,4].split { it % 2 == 0 }
+ '''
+ }
+
+ void testDGM_takeWhileOnIterable() {
+ assertScript '''
+ class AbcIterable implements Iterable<String> {
+ Iterator<String> iterator() { "abc".iterator() }
+ }
+ def abc = new AbcIterable()
+ assert abc.takeWhile{ it < 'b' } == ['a']
+ assert abc.takeWhile{ it <= 'b' } == ['a', 'b']
+'''
+ }
+ void testDGM_takeWhileOnIterator() {
+ assertScript '''
+ class AbcIterable implements Iterable<String> {
+ Iterator<String> iterator() { "abc".iterator() }
+ }
+ def abc = new AbcIterable()
+ assert abc.iterator().takeWhile{ it < 'b' }.collect() == ['a']
+ assert abc.iterator().takeWhile{ it <= 'b' }.collect() == ['a', 'b']
+'''
+ }
+ void testDGM_takeWhileOnList() {
+ assertScript '''
+ def abc = ['a','b','c']
+ assert abc.iterator().takeWhile{ it < 'b' }.collect() == ['a']
+ assert abc.iterator().takeWhile{ it <= 'b' }.collect() == ['a', 'b']'''
+ }
+ void testDGM_takeWhileOnArray() {
+ assertScript '''
+ String[] abc = ['a','b','c']
+ assert abc.iterator().takeWhile{ it < 'b' }.collect() == ['a']
+ assert abc.iterator().takeWhile{ it <= 'b' }.collect() == ['a', 'b']'''
+ }
+ void testDGM_takeWhileOnMap() {
+ assertScript '''
+ def shopping = [milk:1, bread:2, chocolate:3]
+ assert shopping.takeWhile{ it.key.size() < 6 } == [milk:1, bread:2]
+ assert shopping.takeWhile{ it.value % 2 } == [milk:1]
+ assert shopping.takeWhile{ k, v -> k.size() + v <= 7 } == [milk:1, bread:2]'''
+ }
+
+ void testDGM_times() {
+ assertScript '''
+ String foo(int x) { "x"*x }
+ 10.times {
+ println foo(it)
+ }
+ '''
+ }
+
+ void testDGM_unique() {
+ assertScript '''
+ def orig = [1, 3, 4, 5]
+ def uniq = orig.unique(false) { it % 2 }
+ assert orig == [1, 3, 4, 5]
+ assert uniq == [1, 4]'''
+
+ assertScript '''def orig = [2, 3, 3, 4]
+ def uniq = orig.unique(false) { a, b -> a <=> b }
+ assert orig == [2, 3, 3, 4]
+ assert uniq == [2, 3, 4]'''
+ }
+ void testDGM_uniqueOnCollection() {
+ assertScript '''
+ def orig = [1, 3, 4, 5]
+ def uniq = orig.unique { it % 2 }
+ assert uniq == [1, 4]'''
+
+ assertScript '''def orig = [2, 3, 3, 4]
+ def uniq = orig.unique { a, b -> a <=> b }
+ assert uniq == [2, 3, 4]'''
+ }
+ void testDGM_uniqueOnIterator() {
+ assertScript '''
+ def orig = [1, 3, 4, 5].iterator()
+ def uniq = orig.unique { it % 2 }.collect()
+ assert uniq == [1, 4]'''
+
+ assertScript '''def orig = [2, 3, 3, 4].iterator()
+ def uniq = orig.unique { a, b -> a <=> b }.collect()
+ assert uniq == [2, 3, 4]'''
+ }
+
+ void testDGM_anyOnMap() {
+ assertScript '''
+ assert [a:10, b:1].any { k,v -> k.length() == v }
+ assert [a:10, b:1].any { e -> e.key.length() == e.value }
+ assert [a:10, b:1].any {it.key.length() == it.value }
+ '''
+ }
+ void testDGM_anyOnIterable() {
+ assertScript '''
+ assert ['abc','de','f'].any { it.length() == 2 }
+ '''
+ }
+ void testDGM_anyOnIterator() {
+ assertScript '''
+ assert ['abc','de','f'].iterator().any { it.length() == 2 }
+ '''
+ }
+
+ void testDGM_mapWithDefault() {
+ assertScript '''
+ def map = [a:'A'].withDefault { it.toUpperCase() }
+ assert map.b=='B'
+ '''
+ }
+
+ void testFromStringInSameSourceUnit() {
+ assertScript '''import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.FromString
+
+public <T> void doSomething(T val, @ClosureParams(value=FromString, options="T") Closure cl) {
+ cl(val)
+}
+
+doSomething('foo') {
+ println it.toUpperCase()
+}
+
+doSomething(new Date()) {
+ println it.time
+}
+'''
+
+ }
+
+ void testInferenceWithSAMTypeCoercion() {
+ assertScript '''import java.util.concurrent.Callable
+
+interface Action<T> {
+ void execute(T thing)
+}
+
+class Wrapper<T> {
+
+ private final T thing
+
+ Wrapper(T thing) {
+ this.thing = thing
+ }
+
+ void contravariantTake(Action<? super T> action) {
+ action.execute(thing)
+ }
+
+ void invariantTake(Action<T> action) {
+ action.execute(thing)
+ }
+
+}
+
+static <T> Wrapper<T> wrap(Callable<T> callable) {
+ new Wrapper(callable.call())
+}
+
+static Integer dub(Integer integer) {
+ integer * 2
+}
+
+wrap {
+ 1
+} contravariantTake {
+ dub(it) // fails static compile, 'it' is not known to be Integer
+}
+
+wrap {
+ 1
+} invariantTake {
+ dub(it) // passes static compile, 'it' is known to be Integer
+}
+
+'''
+ }
+
+ void testGroovy6602() {
+ shouldFailWithMessages '''import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.FromString
+
+void foo(@ClosureParams(value = FromString, options = "java.lang.Number")
+ Closure cl) {
+ cl.call(4.5)
+}
+
+foo { Integer i -> println i }
+''', 'Expected parameter of type java.lang.Number but got java.lang.Integer'
+ }
+
+ void testGroovy6729() {
+ assertScript '''import groovy.transform.stc.ClosureParams
+import groovy.transform.stc.FirstParam
+
+ static <T> List<T> callee01(List<T>self, @ClosureParams(FirstParam.FirstGenericType) Closure c) {
+ self.each {
+ c.call(it)
+ }
+ return self
+ }
+ callee01(["a","b","c"]) { a ->
+ println(a.toUpperCase()) // [Static type checking] - Cannot find matching method java.lang.Object#toUpperCase(). Please check if the declared type is right and if the method exists.
+ }
+ '''
+ }
+
+ void testGroovy6735() {
+ assertScript '''
+def extractInfo(String s) {
+ def squareNums = s.findAll(/\\d+/) { String num -> num.toInteger() }.collect{ Integer num -> num ** 2 }
+ def wordSizePlusNum = s.findAll(/\\s*(\\w+)\\s*(\\d+)/) { _, String word, String num -> word.size() + num.toInteger() }
+ def numPlusWordSize = s.findAll(/\\s*(\\w+)\\s*(\\d+)/) { _, word, num -> num.toInteger() + word.size() }
+ [squareNums, wordSizePlusNum, numPlusWordSize]
+}
+assert extractInfo(" ab 12 cdef 34 jhg ") == [[144, 1156], [14, 38], [14, 38]]
+'''
+ assertScript '''
+def method() {
+ assert "foobarbaz".findAll('b(a)([rz])') { full, a, b -> assert "BA"=="B" + a.toUpperCase() }.size() == 2
+ assert "foobarbaz".findAll('ba') { String found -> assert "BA" == found.toUpperCase() }.size() == 2
+}
+
+method()
+'''
+ }
+}
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ClosuresSTCTest.groovy b/src/test/groovy/transform/stc/ClosuresSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ClosuresSTCTest.groovy
rename to src/test/groovy/transform/stc/ClosuresSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/CoercionSTCTest.groovy b/src/test/groovy/transform/stc/CoercionSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/CoercionSTCTest.groovy
rename to src/test/groovy/transform/stc/CoercionSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy b/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ConstructorsSTCTest.groovy
rename to src/test/groovy/transform/stc/ConstructorsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/CustomErrorCollectorSTCTest.groovy b/src/test/groovy/transform/stc/CustomErrorCollectorSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/CustomErrorCollectorSTCTest.groovy
rename to src/test/groovy/transform/stc/CustomErrorCollectorSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy b/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy
rename to src/test/groovy/transform/stc/DefaultGroovyMethodsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy b/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/DelegatesToSTCTest.groovy
rename to src/test/groovy/transform/stc/DelegatesToSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
rename to src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/GenericsSTCTest.groovy
rename to src/test/groovy/transform/stc/GenericsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/Groovy7184Bug.groovy b/src/test/groovy/transform/stc/Groovy7184Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/Groovy7184Bug.groovy
rename to src/test/groovy/transform/stc/Groovy7184Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/IOGMClosureParamTypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/IOGMClosureParamTypeInferenceSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/IOGMClosureParamTypeInferenceSTCTest.groovy
rename to src/test/groovy/transform/stc/IOGMClosureParamTypeInferenceSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/LoopsSTCTest.groovy b/src/test/groovy/transform/stc/LoopsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/LoopsSTCTest.groovy
rename to src/test/groovy/transform/stc/LoopsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MethodCallsSTCTest.groovy b/src/test/groovy/transform/stc/MethodCallsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MethodCallsSTCTest.groovy
rename to src/test/groovy/transform/stc/MethodCallsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MiscSTCTest.groovy b/src/test/groovy/transform/stc/MiscSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MiscSTCTest.groovy
rename to src/test/groovy/transform/stc/MiscSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MyBean.java b/src/test/groovy/transform/stc/MyBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MyBean.java
rename to src/test/groovy/transform/stc/MyBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MyType.java b/src/test/groovy/transform/stc/MyType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/MyType.java
rename to src/test/groovy/transform/stc/MyType.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/PrecompiledExtension.groovy b/src/test/groovy/transform/stc/PrecompiledExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/PrecompiledExtension.groovy
rename to src/test/groovy/transform/stc/PrecompiledExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/PrecompiledExtensionNotExtendingDSL.groovy b/src/test/groovy/transform/stc/PrecompiledExtensionNotExtendingDSL.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/PrecompiledExtensionNotExtendingDSL.groovy
rename to src/test/groovy/transform/stc/PrecompiledExtensionNotExtendingDSL.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/RangesSTCTest.groovy b/src/test/groovy/transform/stc/RangesSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/RangesSTCTest.groovy
rename to src/test/groovy/transform/stc/RangesSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ResourceGMClosureParamTypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/ResourceGMClosureParamTypeInferenceSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ResourceGMClosureParamTypeInferenceSTCTest.groovy
rename to src/test/groovy/transform/stc/ResourceGMClosureParamTypeInferenceSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ReturnsSTCTest.groovy b/src/test/groovy/transform/stc/ReturnsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/ReturnsSTCTest.groovy
rename to src/test/groovy/transform/stc/ReturnsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCAssignmentTest.groovy b/src/test/groovy/transform/stc/STCAssignmentTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCAssignmentTest.groovy
rename to src/test/groovy/transform/stc/STCAssignmentTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCExtensionMethodsTest.groovy b/src/test/groovy/transform/stc/STCExtensionMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCExtensionMethodsTest.groovy
rename to src/test/groovy/transform/stc/STCExtensionMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCnAryExpressionTest.groovy b/src/test/groovy/transform/stc/STCnAryExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCnAryExpressionTest.groovy
rename to src/test/groovy/transform/stc/STCnAryExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCwithTransformationsTest.groovy b/src/test/groovy/transform/stc/STCwithTransformationsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/STCwithTransformationsTest.groovy
rename to src/test/groovy/transform/stc/STCwithTransformationsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/SocketGMClosureParamTypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/SocketGMClosureParamTypeInferenceSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/SocketGMClosureParamTypeInferenceSTCTest.groovy
rename to src/test/groovy/transform/stc/SocketGMClosureParamTypeInferenceSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy b/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
rename to src/test/groovy/transform/stc/StaticTypeCheckingTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/StringGMClosureParamTypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/StringGMClosureParamTypeInferenceSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/StringGMClosureParamTypeInferenceSTCTest.groovy
rename to src/test/groovy/transform/stc/StringGMClosureParamTypeInferenceSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TernaryOperatorSTCTest.groovy b/src/test/groovy/transform/stc/TernaryOperatorSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TernaryOperatorSTCTest.groovy
rename to src/test/groovy/transform/stc/TernaryOperatorSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TypeCheckingExtensionsTest.groovy b/src/test/groovy/transform/stc/TypeCheckingExtensionsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TypeCheckingExtensionsTest.groovy
rename to src/test/groovy/transform/stc/TypeCheckingExtensionsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TypeCheckingModeTest.groovy b/src/test/groovy/transform/stc/TypeCheckingModeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TypeCheckingModeTest.groovy
rename to src/test/groovy/transform/stc/TypeCheckingModeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TypeInferenceSTCTest.groovy b/src/test/groovy/transform/stc/TypeInferenceSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/TypeInferenceSTCTest.groovy
rename to src/test/groovy/transform/stc/TypeInferenceSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy b/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy
rename to src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/WithSTCTest.groovy b/src/test/groovy/transform/stc/WithSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/WithSTCTest.groovy
rename to src/test/groovy/transform/stc/WithSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/package.html b/src/test/groovy/transform/stc/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/package.html
rename to src/test/groovy/transform/stc/package.html
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/vm6/MethodCallsSTCTest.groovy b/src/test/groovy/transform/stc/vm6/MethodCallsSTCTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/transform/stc/vm6/MethodCallsSTCTest.groovy
rename to src/test/groovy/transform/stc/vm6/MethodCallsSTCTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/ClosureClassLoaderBug.groovy b/src/test/groovy/tree/ClosureClassLoaderBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/ClosureClassLoaderBug.groovy
rename to src/test/groovy/tree/ClosureClassLoaderBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/NavigationTest.groovy b/src/test/groovy/tree/NavigationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/NavigationTest.groovy
rename to src/test/groovy/tree/NavigationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/NestedClosureBugTest.groovy b/src/test/groovy/tree/NestedClosureBugTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/NestedClosureBugTest.groovy
rename to src/test/groovy/tree/NestedClosureBugTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/NodePrinterTest.java b/src/test/groovy/tree/NodePrinterTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/NodePrinterTest.java
rename to src/test/groovy/tree/NodePrinterTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/SmallTreeTest.groovy b/src/test/groovy/tree/SmallTreeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/SmallTreeTest.groovy
rename to src/test/groovy/tree/SmallTreeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/TreeTest.groovy b/src/test/groovy/tree/TreeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/TreeTest.groovy
rename to src/test/groovy/tree/TreeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/tree/VerboseTreeTest.groovy b/src/test/groovy/tree/VerboseTreeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/tree/VerboseTreeTest.groovy
rename to src/test/groovy/tree/VerboseTreeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/txn/TransactionBean.java b/src/test/groovy/txn/TransactionBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/txn/TransactionBean.java
rename to src/test/groovy/txn/TransactionBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/txn/TransactionBuilder.java b/src/test/groovy/txn/TransactionBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/txn/TransactionBuilder.java
rename to src/test/groovy/txn/TransactionBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/txn/TransactionTest.groovy b/src/test/groovy/txn/TransactionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/txn/TransactionTest.groovy
rename to src/test/groovy/txn/TransactionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/ui/GroovyMainTest.groovy b/src/test/groovy/ui/GroovyMainTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/ui/GroovyMainTest.groovy
rename to src/test/groovy/ui/GroovyMainTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/BuilderSupportTest.groovy b/src/test/groovy/util/BuilderSupportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/BuilderSupportTest.groovy
rename to src/test/groovy/util/BuilderSupportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/CliBuilderTest.groovy b/src/test/groovy/util/CliBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/CliBuilderTest.groovy
rename to src/test/groovy/util/CliBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ConfigObjectTest.groovy b/src/test/groovy/util/ConfigObjectTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ConfigObjectTest.groovy
rename to src/test/groovy/util/ConfigObjectTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ConfigSlurperTest.groovy b/src/test/groovy/util/ConfigSlurperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ConfigSlurperTest.groovy
rename to src/test/groovy/util/ConfigSlurperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/DelegatingScriptTest.groovy b/src/test/groovy/util/DelegatingScriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/DelegatingScriptTest.groovy
rename to src/test/groovy/util/DelegatingScriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/EvalTest.java b/src/test/groovy/util/EvalTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/EvalTest.java
rename to src/test/groovy/util/EvalTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/FactoryBuilderSupportTest.groovy b/src/test/groovy/util/FactoryBuilderSupportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/FactoryBuilderSupportTest.groovy
rename to src/test/groovy/util/FactoryBuilderSupportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/FileTreeBuilderTest.groovy b/src/test/groovy/util/FileTreeBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/FileTreeBuilderTest.groovy
rename to src/test/groovy/util/FileTreeBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/GroovyCollectionsStarImportTest.groovy b/src/test/groovy/util/GroovyCollectionsStarImportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/GroovyCollectionsStarImportTest.groovy
rename to src/test/groovy/util/GroovyCollectionsStarImportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/GroovyCollectionsTest.groovy b/src/test/groovy/util/GroovyCollectionsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/GroovyCollectionsTest.groovy
rename to src/test/groovy/util/GroovyCollectionsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/GroovyScriptEngineReloadingTest.groovy b/src/test/groovy/util/GroovyScriptEngineReloadingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/GroovyScriptEngineReloadingTest.groovy
rename to src/test/groovy/util/GroovyScriptEngineReloadingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/HeadlessTestSupport.groovy b/src/test/groovy/util/HeadlessTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/HeadlessTestSupport.groovy
rename to src/test/groovy/util/HeadlessTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/IndentPrinterTest.groovy b/src/test/groovy/util/IndentPrinterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/IndentPrinterTest.groovy
rename to src/test/groovy/util/IndentPrinterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy b/src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy
rename to src/test/groovy/util/JavadocAssertionTestBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/MiscScriptTest.groovy b/src/test/groovy/util/MiscScriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/MiscScriptTest.groovy
rename to src/test/groovy/util/MiscScriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/NodeTest.groovy b/src/test/groovy/util/NodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/NodeTest.groovy
rename to src/test/groovy/util/NodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObjectGraphBuilderTest.groovy b/src/test/groovy/util/ObjectGraphBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObjectGraphBuilderTest.groovy
rename to src/test/groovy/util/ObjectGraphBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObservableListTest.groovy b/src/test/groovy/util/ObservableListTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObservableListTest.groovy
rename to src/test/groovy/util/ObservableListTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObservableMapTest.groovy b/src/test/groovy/util/ObservableMapTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObservableMapTest.groovy
rename to src/test/groovy/util/ObservableMapTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObservableSetTests.groovy b/src/test/groovy/util/ObservableSetTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ObservableSetTests.groovy
rename to src/test/groovy/util/ObservableSetTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/OrderByTest.groovy b/src/test/groovy/util/OrderByTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/OrderByTest.groovy
rename to src/test/groovy/util/OrderByTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ProxyGeneratorAdapterTest.groovy b/src/test/groovy/util/ProxyGeneratorAdapterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ProxyGeneratorAdapterTest.groovy
rename to src/test/groovy/util/ProxyGeneratorAdapterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ProxyGeneratorTest.groovy b/src/test/groovy/util/ProxyGeneratorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ProxyGeneratorTest.groovy
rename to src/test/groovy/util/ProxyGeneratorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ProxyTest.groovy b/src/test/groovy/util/ProxyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ProxyTest.groovy
rename to src/test/groovy/util/ProxyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/ResourceBundleTest.groovy b/src/test/groovy/util/ResourceBundleTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/ResourceBundleTest.groovy
rename to src/test/groovy/util/ResourceBundleTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/i18n.properties b/src/test/groovy/util/i18n.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/i18n.properties
rename to src/test/groovy/util/i18n.properties
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/i18n_en.properties b/src/test/groovy/util/i18n_en.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/i18n_en.properties
rename to src/test/groovy/util/i18n_en.properties
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/i18n_fr.properties b/src/test/groovy/util/i18n_fr.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/i18n_fr.properties
rename to src/test/groovy/util/i18n_fr.properties
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/CommonsTest.groovy b/src/test/groovy/util/logging/CommonsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/CommonsTest.groovy
rename to src/test/groovy/util/logging/CommonsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/Log4j2Test.groovy b/src/test/groovy/util/logging/Log4j2Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/Log4j2Test.groovy
rename to src/test/groovy/util/logging/Log4j2Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/Log4jTest.groovy b/src/test/groovy/util/logging/Log4jTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/Log4jTest.groovy
rename to src/test/groovy/util/logging/Log4jTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/LogTest.groovy b/src/test/groovy/util/logging/LogTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/LogTest.groovy
rename to src/test/groovy/util/logging/LogTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/Slf4jTest.groovy b/src/test/groovy/util/logging/Slf4jTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/logging/Slf4jTest.groovy
rename to src/test/groovy/util/logging/Slf4jTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/util/system.properties b/src/test/groovy/util/system.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/util/system.properties
rename to src/test/groovy/util/system.properties
diff --git a/groovy/upstream/groovy-2.4.3/src/test/groovy/xml/XmlAssert.java b/src/test/groovy/xml/XmlAssert.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/groovy/xml/XmlAssert.java
rename to src/test/groovy/xml/XmlAssert.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/indy/IndyUsageTest.groovy b/src/test/indy/IndyUsageTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/indy/IndyUsageTest.groovy
rename to src/test/indy/IndyUsageTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ClosureAndInnerClassNodeStructureTest.groovy b/src/test/org/codehaus/groovy/ClosureAndInnerClassNodeStructureTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ClosureAndInnerClassNodeStructureTest.groovy
rename to src/test/org/codehaus/groovy/ClosureAndInnerClassNodeStructureTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/AnnotationSourceParsingTest.java b/src/test/org/codehaus/groovy/antlr/AnnotationSourceParsingTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/AnnotationSourceParsingTest.java
rename to src/test/org/codehaus/groovy/antlr/AnnotationSourceParsingTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/AntlrParserPluginTest.groovy b/src/test/org/codehaus/groovy/antlr/AntlrParserPluginTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/AntlrParserPluginTest.groovy
rename to src/test/org/codehaus/groovy/antlr/AntlrParserPluginTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java b/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java
rename to src/test/org/codehaus/groovy/antlr/EnumSourceParsingTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/GStringEndTest.groovy b/src/test/org/codehaus/groovy/antlr/GStringEndTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/GStringEndTest.groovy
rename to src/test/org/codehaus/groovy/antlr/GStringEndTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java b/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java
rename to src/test/org/codehaus/groovy/antlr/GroovySourceASTTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java b/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/SourceBufferTest.java
rename to src/test/org/codehaus/groovy/antlr/SourceBufferTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/SourceParserTest.java b/src/test/org/codehaus/groovy/antlr/SourceParserTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/SourceParserTest.java
rename to src/test/org/codehaus/groovy/antlr/SourceParserTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/CompositeVisitorTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/CompositeVisitorTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/CompositeVisitorTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/CompositeVisitorTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/Java2GroovyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/LineColumnChecker.java b/src/test/org/codehaus/groovy/antlr/treewalker/LineColumnChecker.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/LineColumnChecker.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/LineColumnChecker.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/LineColumnTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/LineColumnTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/LineColumnTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/LineColumnTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/NodePrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/NodePrinterTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/NodePrinterTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/NodePrinterTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/SourcePrinterTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/TraversalTestHelper.java b/src/test/org/codehaus/groovy/antlr/treewalker/TraversalTestHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/TraversalTestHelper.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/TraversalTestHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java
rename to src/test/org/codehaus/groovy/antlr/treewalker/UnimplementedSyntaxTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/ASTTest.java b/src/test/org/codehaus/groovy/ast/ASTTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/ASTTest.java
rename to src/test/org/codehaus/groovy/ast/ASTTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/ClassNodeTest.java b/src/test/org/codehaus/groovy/ast/ClassNodeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/ClassNodeTest.java
rename to src/test/org/codehaus/groovy/ast/ClassNodeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/CodeVisitorSupportTest.groovy b/src/test/org/codehaus/groovy/ast/CodeVisitorSupportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/CodeVisitorSupportTest.groovy
rename to src/test/org/codehaus/groovy/ast/CodeVisitorSupportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/GenericsTestCase.groovy b/src/test/org/codehaus/groovy/ast/GenericsTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/GenericsTestCase.groovy
rename to src/test/org/codehaus/groovy/ast/GenericsTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/GenericsTypeTest.groovy b/src/test/org/codehaus/groovy/ast/GenericsTypeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/GenericsTypeTest.groovy
rename to src/test/org/codehaus/groovy/ast/GenericsTypeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/LazyInitOnClassNodeTest.groovy b/src/test/org/codehaus/groovy/ast/LazyInitOnClassNodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/LazyInitOnClassNodeTest.groovy
rename to src/test/org/codehaus/groovy/ast/LazyInitOnClassNodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt b/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
rename to src/test/org/codehaus/groovy/ast/LineColumnCheck.txt
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/LineColumnChecker.java b/src/test/org/codehaus/groovy/ast/LineColumnChecker.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/LineColumnChecker.java
rename to src/test/org/codehaus/groovy/ast/LineColumnChecker.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/MethodCallExpressionTest.java b/src/test/org/codehaus/groovy/ast/MethodCallExpressionTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/MethodCallExpressionTest.java
rename to src/test/org/codehaus/groovy/ast/MethodCallExpressionTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/MethodNodeTest.groovy b/src/test/org/codehaus/groovy/ast/MethodNodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/MethodNodeTest.groovy
rename to src/test/org/codehaus/groovy/ast/MethodNodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java b/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/ModuleNodeTest.java
rename to src/test/org/codehaus/groovy/ast/ModuleNodeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/VariableExpressionTest.java b/src/test/org/codehaus/groovy/ast/VariableExpressionTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/VariableExpressionTest.java
rename to src/test/org/codehaus/groovy/ast/VariableExpressionTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstAssert.groovy b/src/test/org/codehaus/groovy/ast/builder/AstAssert.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstAssert.groovy
rename to src/test/org/codehaus/groovy/ast/builder/AstAssert.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromCodeTest.groovy b/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromCodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromCodeTest.groovy
rename to src/test/org/codehaus/groovy/ast/builder/AstBuilderFromCodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromSpecificationTest.groovy b/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromSpecificationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromSpecificationTest.groovy
rename to src/test/org/codehaus/groovy/ast/builder/AstBuilderFromSpecificationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromStringTest.groovy b/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromStringTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/AstBuilderFromStringTest.groovy
rename to src/test/org/codehaus/groovy/ast/builder/AstBuilderFromStringTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/WithAstBuilder.groovy b/src/test/org/codehaus/groovy/ast/builder/WithAstBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/WithAstBuilder.groovy
rename to src/test/org/codehaus/groovy/ast/builder/WithAstBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/testpackage/AstBuilderFromCodePackageImportTest.groovy b/src/test/org/codehaus/groovy/ast/builder/testpackage/AstBuilderFromCodePackageImportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/builder/testpackage/AstBuilderFromCodePackageImportTest.groovy
rename to src/test/org/codehaus/groovy/ast/builder/testpackage/AstBuilderFromCodePackageImportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/ClosureExpressionTest.groovy b/src/test/org/codehaus/groovy/ast/expr/ClosureExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/ClosureExpressionTest.groovy
rename to src/test/org/codehaus/groovy/ast/expr/ClosureExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/MapExpressionTest.groovy b/src/test/org/codehaus/groovy/ast/expr/MapExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/MapExpressionTest.groovy
rename to src/test/org/codehaus/groovy/ast/expr/MapExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/MethodCallExpressionTest.groovy b/src/test/org/codehaus/groovy/ast/expr/MethodCallExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/MethodCallExpressionTest.groovy
rename to src/test/org/codehaus/groovy/ast/expr/MethodCallExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/PropertyExpressionTest.groovy b/src/test/org/codehaus/groovy/ast/expr/PropertyExpressionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/expr/PropertyExpressionTest.groovy
rename to src/test/org/codehaus/groovy/ast/expr/PropertyExpressionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/Groovy3049Test.groovy b/src/test/org/codehaus/groovy/ast/source/Groovy3049Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/Groovy3049Test.groovy
rename to src/test/org/codehaus/groovy/ast/source/Groovy3049Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/Groovy3050Test.groovy b/src/test/org/codehaus/groovy/ast/source/Groovy3050Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/Groovy3050Test.groovy
rename to src/test/org/codehaus/groovy/ast/source/Groovy3050Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/Groovy3051Test.groovy b/src/test/org/codehaus/groovy/ast/source/Groovy3051Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/Groovy3051Test.groovy
rename to src/test/org/codehaus/groovy/ast/source/Groovy3051Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/SourceBaseTestCase.groovy b/src/test/org/codehaus/groovy/ast/source/SourceBaseTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/source/SourceBaseTestCase.groovy
rename to src/test/org/codehaus/groovy/ast/source/SourceBaseTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/tools/WideningCategoriesTest.groovy b/src/test/org/codehaus/groovy/ast/tools/WideningCategoriesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/ast/tools/WideningCategoriesTest.groovy
rename to src/test/org/codehaus/groovy/ast/tools/WideningCategoriesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/binarytrees.groovy b/src/test/org/codehaus/groovy/benchmarks/alioth/binarytrees.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/binarytrees.groovy
rename to src/test/org/codehaus/groovy/benchmarks/alioth/binarytrees.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/fannkuch.groovy b/src/test/org/codehaus/groovy/benchmarks/alioth/fannkuch.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/fannkuch.groovy
rename to src/test/org/codehaus/groovy/benchmarks/alioth/fannkuch.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/partialsums.groovy b/src/test/org/codehaus/groovy/benchmarks/alioth/partialsums.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/partialsums.groovy
rename to src/test/org/codehaus/groovy/benchmarks/alioth/partialsums.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/rayTracer.groovy b/src/test/org/codehaus/groovy/benchmarks/alioth/rayTracer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/rayTracer.groovy
rename to src/test/org/codehaus/groovy/benchmarks/alioth/rayTracer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/recursive.groovy b/src/test/org/codehaus/groovy/benchmarks/alioth/recursive.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/recursive.groovy
rename to src/test/org/codehaus/groovy/benchmarks/alioth/recursive.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/spectralnorm.groovy b/src/test/org/codehaus/groovy/benchmarks/alioth/spectralnorm.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/alioth/spectralnorm.groovy
rename to src/test/org/codehaus/groovy/benchmarks/alioth/spectralnorm.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Builder.java b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Builder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Builder.java
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Builder.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Main.java b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Main.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Main.java
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/Main.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/ScriptLauncher.java b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/ScriptLauncher.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/ScriptLauncher.java
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/ScriptLauncher.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script120.groovy b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script120.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script120.groovy
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script120.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script240.groovy b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script240.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script240.groovy
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script240.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script30.groovy b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script30.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script30.groovy
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script30.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300.groovy b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300.groovy
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300WithCategory.groovy b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300WithCategory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300WithCategory.groovy
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script300WithCategory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script60.groovy b/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script60.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script60.groovy
rename to src/test/org/codehaus/groovy/benchmarks/vm5/b2394/script60.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/psum.java b/src/test/org/codehaus/groovy/benchmarks/vm5/psum.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/psum.java
rename to src/test/org/codehaus/groovy/benchmarks/vm5/psum.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/spectralnorm.java b/src/test/org/codehaus/groovy/benchmarks/vm5/spectralnorm.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/benchmarks/vm5/spectralnorm.java
rename to src/test/org/codehaus/groovy/benchmarks/vm5/spectralnorm.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/BytecodeHelperTest.groovy b/src/test/org/codehaus/groovy/classgen/BytecodeHelperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/BytecodeHelperTest.groovy
rename to src/test/org/codehaus/groovy/classgen/BytecodeHelperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CallClosureFieldAsMethodTest.groovy b/src/test/org/codehaus/groovy/classgen/CallClosureFieldAsMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CallClosureFieldAsMethodTest.groovy
rename to src/test/org/codehaus/groovy/classgen/CallClosureFieldAsMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CallSiteTest.groovy b/src/test/org/codehaus/groovy/classgen/CallSiteTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CallSiteTest.groovy
rename to src/test/org/codehaus/groovy/classgen/CallSiteTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java b/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CapitalizeTest.java
rename to src/test/org/codehaus/groovy/classgen/CapitalizeTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CastTest.groovy b/src/test/org/codehaus/groovy/classgen/CastTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/CastTest.groovy
rename to src/test/org/codehaus/groovy/classgen/CastTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ClassCompletionVerifierTest.java b/src/test/org/codehaus/groovy/classgen/ClassCompletionVerifierTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ClassCompletionVerifierTest.java
rename to src/test/org/codehaus/groovy/classgen/ClassCompletionVerifierTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ConstructorIssueTest.groovy b/src/test/org/codehaus/groovy/classgen/ConstructorIssueTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ConstructorIssueTest.groovy
rename to src/test/org/codehaus/groovy/classgen/ConstructorIssueTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ConstructorTest.java b/src/test/org/codehaus/groovy/classgen/ConstructorTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ConstructorTest.java
rename to src/test/org/codehaus/groovy/classgen/ConstructorTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DerivedBean.java b/src/test/org/codehaus/groovy/classgen/DerivedBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DerivedBean.java
rename to src/test/org/codehaus/groovy/classgen/DerivedBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DummyReflector.java b/src/test/org/codehaus/groovy/classgen/DummyReflector.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DummyReflector.java
rename to src/test/org/codehaus/groovy/classgen/DummyReflector.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DummyTestDerivation.java b/src/test/org/codehaus/groovy/classgen/DummyTestDerivation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DummyTestDerivation.java
rename to src/test/org/codehaus/groovy/classgen/DummyTestDerivation.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DumpingClassLoader.java b/src/test/org/codehaus/groovy/classgen/DumpingClassLoader.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/DumpingClassLoader.java
rename to src/test/org/codehaus/groovy/classgen/DumpingClassLoader.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ForTest.java b/src/test/org/codehaus/groovy/classgen/ForTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ForTest.java
rename to src/test/org/codehaus/groovy/classgen/ForTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GStringTest.java b/src/test/org/codehaus/groovy/classgen/GStringTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GStringTest.java
rename to src/test/org/codehaus/groovy/classgen/GStringTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy b/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
rename to src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GetPropertyTest.java b/src/test/org/codehaus/groovy/classgen/GetPropertyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GetPropertyTest.java
rename to src/test/org/codehaus/groovy/classgen/GetPropertyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GroovyClassLoaderTest.java b/src/test/org/codehaus/groovy/classgen/GroovyClassLoaderTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/GroovyClassLoaderTest.java
rename to src/test/org/codehaus/groovy/classgen/GroovyClassLoaderTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/IfElseTest.java b/src/test/org/codehaus/groovy/classgen/IfElseTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/IfElseTest.java
rename to src/test/org/codehaus/groovy/classgen/IfElseTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy b/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
rename to src/test/org/codehaus/groovy/classgen/InterfaceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/JO.java b/src/test/org/codehaus/groovy/classgen/JO.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/JO.java
rename to src/test/org/codehaus/groovy/classgen/JO.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/Main.groovy b/src/test/org/codehaus/groovy/classgen/Main.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/Main.groovy
rename to src/test/org/codehaus/groovy/classgen/Main.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MainTest.java b/src/test/org/codehaus/groovy/classgen/MainTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MainTest.java
rename to src/test/org/codehaus/groovy/classgen/MainTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MetaClassTest.groovy b/src/test/org/codehaus/groovy/classgen/MetaClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MetaClassTest.groovy
rename to src/test/org/codehaus/groovy/classgen/MetaClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MethodTest.java b/src/test/org/codehaus/groovy/classgen/MethodTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MethodTest.java
rename to src/test/org/codehaus/groovy/classgen/MethodTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MyBean.groovy b/src/test/org/codehaus/groovy/classgen/MyBean.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/MyBean.groovy
rename to src/test/org/codehaus/groovy/classgen/MyBean.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/PropertyTest.java b/src/test/org/codehaus/groovy/classgen/PropertyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/PropertyTest.java
rename to src/test/org/codehaus/groovy/classgen/PropertyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ReflectorGeneratorTest.java b/src/test/org/codehaus/groovy/classgen/ReflectorGeneratorTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ReflectorGeneratorTest.java
rename to src/test/org/codehaus/groovy/classgen/ReflectorGeneratorTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ReflectorLoaderTest.groovy b/src/test/org/codehaus/groovy/classgen/ReflectorLoaderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/ReflectorLoaderTest.groovy
rename to src/test/org/codehaus/groovy/classgen/ReflectorLoaderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/RunBugsTest.java b/src/test/org/codehaus/groovy/classgen/RunBugsTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/RunBugsTest.java
rename to src/test/org/codehaus/groovy/classgen/RunBugsTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/RunClosureTest.java b/src/test/org/codehaus/groovy/classgen/RunClosureTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/RunClosureTest.java
rename to src/test/org/codehaus/groovy/classgen/RunClosureTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/RunGroovyTest.java b/src/test/org/codehaus/groovy/classgen/RunGroovyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/RunGroovyTest.java
rename to src/test/org/codehaus/groovy/classgen/RunGroovyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/SimpleBean.java b/src/test/org/codehaus/groovy/classgen/SimpleBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/SimpleBean.java
rename to src/test/org/codehaus/groovy/classgen/SimpleBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/TestSupport.java b/src/test/org/codehaus/groovy/classgen/TestSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/TestSupport.java
rename to src/test/org/codehaus/groovy/classgen/TestSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/TupleListTest.java b/src/test/org/codehaus/groovy/classgen/TupleListTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/TupleListTest.java
rename to src/test/org/codehaus/groovy/classgen/TupleListTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/VerifierCodeVisitorTest.java b/src/test/org/codehaus/groovy/classgen/VerifierCodeVisitorTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/VerifierCodeVisitorTest.java
rename to src/test/org/codehaus/groovy/classgen/VerifierCodeVisitorTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy b/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/AbstractBytecodeTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/BinaryOperationsTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/BinaryOperationsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/BinaryOperationsTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/BinaryOperationsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/CovariantReturnBytecodeTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/CovariantReturnBytecodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/CovariantReturnBytecodeTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/CovariantReturnBytecodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/DirectMethodCallTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/DirectMethodCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/DirectMethodCallTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/DirectMethodCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/HotSwapTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/HotSwapTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/HotSwapTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/HotSwapTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/InstructionSequenceHelperClassTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/InstructionSequenceHelperClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/InstructionSequenceHelperClassTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/InstructionSequenceHelperClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/MethodPatternsTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/MethodPatternsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/MethodPatternsTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/MethodPatternsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/PrintlnLoadsAConstantTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/PrintlnLoadsAConstantTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/PrintlnLoadsAConstantTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/PrintlnLoadsAConstantTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/AnonymousInnerClassStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/AnonymousInnerClassStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/AnonymousInnerClassStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/AnonymousInnerClassStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ArraysAndCollectionsStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/ArraysAndCollectionsStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ArraysAndCollectionsStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/ArraysAndCollectionsStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/AssignmentsStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/AssignmentsStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/AssignmentsStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/AssignmentsStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/BugsStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/BugsStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/BugsStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/BugsStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ClosureParamTypeInferrenceStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/ClosureParamTypeInferrenceStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ClosureParamTypeInferrenceStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/ClosureParamTypeInferrenceStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ClosuresStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/ClosuresStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ClosuresStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/ClosuresStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/CompatWithASTXFormStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/CompatWithASTXFormStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/CompatWithASTXFormStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/CompatWithASTXFormStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/CompileDynamicTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/CompileDynamicTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/CompileDynamicTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/CompileDynamicTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/DelegatesToStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/DelegatesToStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/DelegatesToStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/DelegatesToStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/GenericsStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/GenericsStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/GenericsStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/GenericsStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/GetAnnotationStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/GetAnnotationStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/GetAnnotationStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/GetAnnotationStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6924Support.java b/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6924Support.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6924Support.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6924Support.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6955Support.java b/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6955Support.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6955Support.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/Groovy6955Support.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/Groovy7222OptimizationsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/IOGMClosureParamTypeInferrenceStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/IOGMClosureParamTypeInferrenceStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/IOGMClosureParamTypeInferrenceStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/IOGMClosureParamTypeInferrenceStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/LoopsStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/LoopsStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/LoopsStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/LoopsStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/MethodCallsStaticCompilationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/MethodCallsStaticCompilationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/MethodCallsStaticCompilationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/MethodCallsStaticCompilationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/MiscStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/MiscStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/MiscStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/MiscStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/MixedModeStaticCompilationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/MixedModeStaticCompilationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/MixedModeStaticCompilationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/MixedModeStaticCompilationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/NaryExpressionTestStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/NaryExpressionTestStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/NaryExpressionTestStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/NaryExpressionTestStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/RangesStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/RangesStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/RangesStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/RangesStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ResourceGMClosureParamTypeInferrenceStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/ResourceGMClosureParamTypeInferrenceStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ResourceGMClosureParamTypeInferrenceStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/ResourceGMClosureParamTypeInferrenceStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ReturnsStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/ReturnsStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/ReturnsStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/ReturnsStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/SocketGMClosureParamTypeInferrenceStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/SocketGMClosureParamTypeInferrenceStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/SocketGMClosureParamTypeInferrenceStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/SocketGMClosureParamTypeInferrenceStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilationTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileArrayLengthAndGet.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileArrayLengthAndGet.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileArrayLengthAndGet.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileArrayLengthAndGet.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileCastOptimizationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileCastOptimizationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileCastOptimizationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileCastOptimizationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileClosureCallTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileClosureCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileClosureCallTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileClosureCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileComparisonTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileComparisonTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileComparisonTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileComparisonTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileConstructorsTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileConstructorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileConstructorsTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileConstructorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMMethodTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMMethodTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMMethodTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMMethodTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileDGMTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFieldAccessTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFieldAccessTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFieldAccessTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFieldAccessTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFlowTypingTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFlowTypingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFlowTypingTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileFlowTypingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileInnerClassTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileInnerClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileInnerClassTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileInnerClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileMathTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileMathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileMathTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileMathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileNullCompareOptimizationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileNullCompareOptimizationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileNullCompareOptimizationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompileNullCompareOptimizationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilePostfixPrefixTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilePostfixPrefixTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilePostfixPrefixTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StaticCompilePostfixPrefixTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StringGMClosureParamTypeInferrenceStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/StringGMClosureParamTypeInferrenceStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/StringGMClosureParamTypeInferrenceStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/StringGMClosureParamTypeInferrenceStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/TupleConstructorStaticCompilationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/TupleConstructorStaticCompilationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/TupleConstructorStaticCompilationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/TupleConstructorStaticCompilationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/TypeCheckingModeStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/TypeCheckingModeStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/TypeCheckingModeStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/TypeCheckingModeStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/TypeInferenceStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/TypeInferenceStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/TypeInferenceStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/TypeInferenceStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/UnaryOperatorStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/UnaryOperatorStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/UnaryOperatorStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/UnaryOperatorStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/WithStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/WithStaticCompileTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/WithStaticCompileTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/WithStaticCompileTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6240Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6240Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6240Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6240Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6276Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6276Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6276Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6276Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6411Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6411Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6411Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6411Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6475Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6475Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6475Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6475Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6533Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6533Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6533Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6533Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6541Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6541Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6541Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6541Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6558Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6558Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6558Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6558Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6564Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6564Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6564Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6564Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6568Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6568Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6568Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6568Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6627Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6627Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6627Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6627Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6650Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6650Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6650Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6650Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6657Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6657Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6657Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6657Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6670Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6670Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6670Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6670Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6671Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6671Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6671Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6671Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6676Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6676Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6676Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6676Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6693Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6693Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6693Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6693Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6724Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6724Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6724Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6724Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6733Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6733Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6733Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6733Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6757Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6757Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6757Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6757Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6782Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6782Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6782Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6782Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6962Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6962Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6962Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy6962Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7039Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7039Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7039Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7039Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7041Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7041Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7041Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7041Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7042Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7042Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7042Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7042Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7072Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7072Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7072Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7072Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7075Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7075Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7075Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7075Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7093Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7093Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7093Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7093Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7098Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7098Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7098Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7098Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7133Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7133Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7133Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7133Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7138Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7138Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7138Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7138Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7145Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7145Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7145Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7145Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7149Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7149Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7149Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7149Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7169Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7169Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7169Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7169Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7210Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7210Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7210Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7210Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7211Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7211Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7211Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7211Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7242Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7242Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7242Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7242Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7276Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7276Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7276Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7276Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7298Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7298Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7298Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7298Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7300Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7300Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7300Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7300Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7307Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7307Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7307Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7307Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7316Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7316Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7316Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7316Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7322Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7322Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7322Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7322Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7324Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7324Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7324Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7324Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7325Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7325Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7325Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7325Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7327Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7327Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7327Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7327Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7333Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7333Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7333Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7333Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7343Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7343Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7343Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7343Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7355Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7355Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7355Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7355Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7356Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7356Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7356Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7356Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7357Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7357Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7357Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7357Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7358Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7358Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7358Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7358Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7361Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7361Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7361Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7361Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7364Bug.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7364Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7364Bug.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/Groovy7364Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Base.java b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Base.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Base.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Base.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Ext.java b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Ext.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Ext.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy6962Ext.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy7133Support.java b/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy7133Support.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy7133Support.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/bugs/support/Groovy7133Support.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235Support.java b/src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235Support.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235Support.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235Support.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235SupportSub.java b/src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235SupportSub.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235SupportSub.java
rename to src/test/org/codehaus/groovy/classgen/asm/sc/support/Groovy6235SupportSub.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/vm6/MethodCallsStaticCompilationTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/vm6/MethodCallsStaticCompilationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/classgen/asm/sc/vm6/MethodCallsStaticCompilationTest.groovy
rename to src/test/org/codehaus/groovy/classgen/asm/sc/vm6/MethodCallsStaticCompilationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/CompilationUnitTest.java b/src/test/org/codehaus/groovy/control/CompilationUnitTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/CompilationUnitTest.java
rename to src/test/org/codehaus/groovy/control/CompilationUnitTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
rename to src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/ASTTransformationCustomizerTest.groovy b/src/test/org/codehaus/groovy/control/customizers/ASTTransformationCustomizerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/ASTTransformationCustomizerTest.groovy
rename to src/test/org/codehaus/groovy/control/customizers/ASTTransformationCustomizerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/ImportCustomizerTest.groovy b/src/test/org/codehaus/groovy/control/customizers/ImportCustomizerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/ImportCustomizerTest.groovy
rename to src/test/org/codehaus/groovy/control/customizers/ImportCustomizerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/SecureASTCustomizerTest.groovy b/src/test/org/codehaus/groovy/control/customizers/SecureASTCustomizerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/SecureASTCustomizerTest.groovy
rename to src/test/org/codehaus/groovy/control/customizers/SecureASTCustomizerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy b/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
rename to src/test/org/codehaus/groovy/control/customizers/builder/CompilerCustomizationBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java b/src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java
rename to src/test/org/codehaus/groovy/control/io/AbstractReaderSourceTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/FileReaderTest.groovy b/src/test/org/codehaus/groovy/control/io/FileReaderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/FileReaderTest.groovy
rename to src/test/org/codehaus/groovy/control/io/FileReaderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/NullWriterTest.groovy b/src/test/org/codehaus/groovy/control/io/NullWriterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/NullWriterTest.groovy
rename to src/test/org/codehaus/groovy/control/io/NullWriterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/StringReaderSourceTest.groovy b/src/test/org/codehaus/groovy/control/io/StringReaderSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/io/StringReaderSourceTest.groovy
rename to src/test/org/codehaus/groovy/control/io/StringReaderSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/messages/SyntaxErrorMessageTest.java b/src/test/org/codehaus/groovy/control/messages/SyntaxErrorMessageTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/control/messages/SyntaxErrorMessageTest.java
rename to src/test/org/codehaus/groovy/control/messages/SyntaxErrorMessageTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/dummy/ClassWithStaticMethod.groovy b/src/test/org/codehaus/groovy/dummy/ClassWithStaticMethod.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/dummy/ClassWithStaticMethod.groovy
rename to src/test/org/codehaus/groovy/dummy/ClassWithStaticMethod.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/dummy/FooHandler.java b/src/test/org/codehaus/groovy/dummy/FooHandler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/dummy/FooHandler.java
rename to src/test/org/codehaus/groovy/dummy/FooHandler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/GroovyClassValueFactoryTest.groovy b/src/test/org/codehaus/groovy/reflection/GroovyClassValueFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/GroovyClassValueFactoryTest.groovy
rename to src/test/org/codehaus/groovy/reflection/GroovyClassValueFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/WeakMapTest.groovy b/src/test/org/codehaus/groovy/reflection/WeakMapTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/WeakMapTest.groovy
rename to src/test/org/codehaus/groovy/reflection/WeakMapTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/utils/PojoCallerTestClass.java b/src/test/org/codehaus/groovy/reflection/utils/PojoCallerTestClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/utils/PojoCallerTestClass.java
rename to src/test/org/codehaus/groovy/reflection/utils/PojoCallerTestClass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/utils/ReflectionUtilsTest.groovy b/src/test/org/codehaus/groovy/reflection/utils/ReflectionUtilsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/reflection/utils/ReflectionUtilsTest.groovy
rename to src/test/org/codehaus/groovy/reflection/utils/ReflectionUtilsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy b/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
rename to src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/CategoryForIteratorTest.groovy b/src/test/org/codehaus/groovy/runtime/CategoryForIteratorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/CategoryForIteratorTest.groovy
rename to src/test/org/codehaus/groovy/runtime/CategoryForIteratorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/CustomBooleanCoercionTest.groovy b/src/test/org/codehaus/groovy/runtime/CustomBooleanCoercionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/CustomBooleanCoercionTest.groovy
rename to src/test/org/codehaus/groovy/runtime/CustomBooleanCoercionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DateGDKTest.groovy b/src/test/org/codehaus/groovy/runtime/DateGDKTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DateGDKTest.groovy
rename to src/test/org/codehaus/groovy/runtime/DateGDKTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy b/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
rename to src/test/org/codehaus/groovy/runtime/DefaultGroovyMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DefaultGroovyStaticMethodsTest.java b/src/test/org/codehaus/groovy/runtime/DefaultGroovyStaticMethodsTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DefaultGroovyStaticMethodsTest.java
rename to src/test/org/codehaus/groovy/runtime/DefaultGroovyStaticMethodsTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DirectoryDeleteTest.groovy b/src/test/org/codehaus/groovy/runtime/DirectoryDeleteTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DirectoryDeleteTest.groovy
rename to src/test/org/codehaus/groovy/runtime/DirectoryDeleteTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DummyBean.java b/src/test/org/codehaus/groovy/runtime/DummyBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/DummyBean.java
rename to src/test/org/codehaus/groovy/runtime/DummyBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/EachLineTest.groovy b/src/test/org/codehaus/groovy/runtime/EachLineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/EachLineTest.groovy
rename to src/test/org/codehaus/groovy/runtime/EachLineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/EachWithReaderAndInputStreamTest.groovy b/src/test/org/codehaus/groovy/runtime/EachWithReaderAndInputStreamTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/EachWithReaderAndInputStreamTest.groovy
rename to src/test/org/codehaus/groovy/runtime/EachWithReaderAndInputStreamTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/FileAppendTest.groovy b/src/test/org/codehaus/groovy/runtime/FileAppendTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/FileAppendTest.groovy
rename to src/test/org/codehaus/groovy/runtime/FileAppendTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy b/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy
rename to src/test/org/codehaus/groovy/runtime/FileLeftShiftTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/FileStaticGroovyMethodsTest.groovy b/src/test/org/codehaus/groovy/runtime/FileStaticGroovyMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/FileStaticGroovyMethodsTest.groovy
rename to src/test/org/codehaus/groovy/runtime/FileStaticGroovyMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/GroovyCategoryTest.groovy b/src/test/org/codehaus/groovy/runtime/GroovyCategoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/GroovyCategoryTest.groovy
rename to src/test/org/codehaus/groovy/runtime/GroovyCategoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InheritedInterfaceMethodTest.java b/src/test/org/codehaus/groovy/runtime/InheritedInterfaceMethodTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InheritedInterfaceMethodTest.java
rename to src/test/org/codehaus/groovy/runtime/InheritedInterfaceMethodTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InterfaceConversionTest.groovy b/src/test/org/codehaus/groovy/runtime/InterfaceConversionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InterfaceConversionTest.groovy
rename to src/test/org/codehaus/groovy/runtime/InterfaceConversionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java b/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java
rename to src/test/org/codehaus/groovy/runtime/InvokeConstructorTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java b/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java
rename to src/test/org/codehaus/groovy/runtime/InvokeGroovyMethodTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
rename to src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokerHelperTest.java b/src/test/org/codehaus/groovy/runtime/InvokerHelperTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokerHelperTest.java
rename to src/test/org/codehaus/groovy/runtime/InvokerHelperTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokerTest.java b/src/test/org/codehaus/groovy/runtime/InvokerTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/InvokerTest.java
rename to src/test/org/codehaus/groovy/runtime/InvokerTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyInvocationHandler.java b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyInvocationHandler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyInvocationHandler.java
rename to src/test/org/codehaus/groovy/runtime/JdkDynamicProxyInvocationHandler.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBean.java b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBean.java
rename to src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBean.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl1.groovy b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl1.groovy
rename to src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl2.groovy b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl2.groovy
rename to src/test/org/codehaus/groovy/runtime/JdkDynamicProxyServiceBeanImpl2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java b/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java
rename to src/test/org/codehaus/groovy/runtime/JdkDynamicProxyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MetaClassHelperTest.java b/src/test/org/codehaus/groovy/runtime/MetaClassHelperTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MetaClassHelperTest.java
rename to src/test/org/codehaus/groovy/runtime/MetaClassHelperTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java b/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MethodFailureTest.java
rename to src/test/org/codehaus/groovy/runtime/MethodFailureTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MethodKeyTest.java b/src/test/org/codehaus/groovy/runtime/MethodKeyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MethodKeyTest.java
rename to src/test/org/codehaus/groovy/runtime/MethodKeyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MethodRankHelperTest.java b/src/test/org/codehaus/groovy/runtime/MethodRankHelperTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MethodRankHelperTest.java
rename to src/test/org/codehaus/groovy/runtime/MethodRankHelperTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MinusTest.groovy b/src/test/org/codehaus/groovy/runtime/MinusTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MinusTest.groovy
rename to src/test/org/codehaus/groovy/runtime/MinusTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MockGroovyObject.java b/src/test/org/codehaus/groovy/runtime/MockGroovyObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/MockGroovyObject.java
rename to src/test/org/codehaus/groovy/runtime/MockGroovyObject.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/NestedCategoryTest.groovy b/src/test/org/codehaus/groovy/runtime/NestedCategoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/NestedCategoryTest.groovy
rename to src/test/org/codehaus/groovy/runtime/NestedCategoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java b/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java
rename to src/test/org/codehaus/groovy/runtime/NewStaticMetaMethodTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy b/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy
rename to src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/PerInstanceMetaClassTest.groovy b/src/test/org/codehaus/groovy/runtime/PerInstanceMetaClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/PerInstanceMetaClassTest.groovy
rename to src/test/org/codehaus/groovy/runtime/PerInstanceMetaClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/PropertyTest.java b/src/test/org/codehaus/groovy/runtime/PropertyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/PropertyTest.java
rename to src/test/org/codehaus/groovy/runtime/PropertyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/ResourceGroovyMethodsTest.groovy b/src/test/org/codehaus/groovy/runtime/ResourceGroovyMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/ResourceGroovyMethodsTest.groovy
rename to src/test/org/codehaus/groovy/runtime/ResourceGroovyMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StaticInitTest.java b/src/test/org/codehaus/groovy/runtime/StaticInitTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StaticInitTest.java
rename to src/test/org/codehaus/groovy/runtime/StaticInitTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StaticPrintlnTest.groovy b/src/test/org/codehaus/groovy/runtime/StaticPrintlnTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StaticPrintlnTest.groovy
rename to src/test/org/codehaus/groovy/runtime/StaticPrintlnTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StringAsClassTest.groovy b/src/test/org/codehaus/groovy/runtime/StringAsClassTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StringAsClassTest.groovy
rename to src/test/org/codehaus/groovy/runtime/StringAsClassTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java b/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java
rename to src/test/org/codehaus/groovy/runtime/StringGroovyMethodsTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/TupleListTest.java b/src/test/org/codehaus/groovy/runtime/TupleListTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/TupleListTest.java
rename to src/test/org/codehaus/groovy/runtime/TupleListTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/URLGetTextTest.groovy b/src/test/org/codehaus/groovy/runtime/URLGetTextTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/URLGetTextTest.groovy
rename to src/test/org/codehaus/groovy/runtime/URLGetTextTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/WithResourceStreamClosedTest.groovy b/src/test/org/codehaus/groovy/runtime/WithResourceStreamClosedTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/WithResourceStreamClosedTest.groovy
rename to src/test/org/codehaus/groovy/runtime/WithResourceStreamClosedTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/WriterAppendTest.groovy b/src/test/org/codehaus/groovy/runtime/WriterAppendTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/WriterAppendTest.groovy
rename to src/test/org/codehaus/groovy/runtime/WriterAppendTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
rename to src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleHelperForTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleTest.groovy b/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleTest.groovy
rename to src/test/org/codehaus/groovy/runtime/m12n/ExtensionModuleTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/Groovy6496Extension.java b/src/test/org/codehaus/groovy/runtime/m12n/Groovy6496Extension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/Groovy6496Extension.java
rename to src/test/org/codehaus/groovy/runtime/m12n/Groovy6496Extension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/TestStaticStringExtension.java b/src/test/org/codehaus/groovy/runtime/m12n/TestStaticStringExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/TestStaticStringExtension.java
rename to src/test/org/codehaus/groovy/runtime/m12n/TestStaticStringExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/TestStringExtension.java b/src/test/org/codehaus/groovy/runtime/m12n/TestStringExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/m12n/TestStringExtension.java
rename to src/test/org/codehaus/groovy/runtime/m12n/TestStringExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/AbstractMemoizeTestCase.groovy b/src/test/org/codehaus/groovy/runtime/memoize/AbstractMemoizeTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/AbstractMemoizeTestCase.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/AbstractMemoizeTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupCollectedSoftReferencesTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupCollectedSoftReferencesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupCollectedSoftReferencesTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupCollectedSoftReferencesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/CacheCleanupTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/LRUProtectionStorageTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/LRUProtectionStorageTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/LRUProtectionStorageTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/LRUProtectionStorageTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtLeastTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtLeastTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtLeastTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtLeastTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtMostTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtMostTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtMostTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/MemoizeAtMostTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeBetweenTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/MemoizeBetweenTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeBetweenTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/MemoizeBetweenTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/MemoizeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/MemoizeTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/MemoizeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/NullValueTest.groovy b/src/test/org/codehaus/groovy/runtime/memoize/NullValueTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/memoize/NullValueTest.groovy
rename to src/test/org/codehaus/groovy/runtime/memoize/NullValueTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/AssertionTestUtil.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/AssertionTestUtil.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/AssertionTestUtil.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/AssertionTestUtil.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/AssertionsInDifferentLocationsTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/AssertionsInDifferentLocationsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/AssertionsInDifferentLocationsTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/AssertionsInDifferentLocationsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/EvaluationTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/EvaluationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/EvaluationTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/EvaluationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/ImplicitClosureCallRenderingTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/ImplicitClosureCallRenderingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/ImplicitClosureCallRenderingTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/ImplicitClosureCallRenderingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/NotTransformedAssertionsTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/NotTransformedAssertionsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/NotTransformedAssertionsTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/NotTransformedAssertionsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/PowerAssertASTTransformationTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/PowerAssertASTTransformationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/PowerAssertASTTransformationTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/PowerAssertASTTransformationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/ScriptEvaluationTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/ScriptEvaluationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/ScriptEvaluationTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/ScriptEvaluationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy
rename to src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/trampoline/TrampolineTest.groovy b/src/test/org/codehaus/groovy/runtime/trampoline/TrampolineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/runtime/trampoline/TrampolineTest.groovy
rename to src/test/org/codehaus/groovy/runtime/trampoline/TrampolineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/syntax/TokenTest.java b/src/test/org/codehaus/groovy/syntax/TokenTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/syntax/TokenTest.java
rename to src/test/org/codehaus/groovy/syntax/TokenTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java b/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
rename to src/test/org/codehaus/groovy/syntax/parser/TestParserSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/CompilerTest.java b/src/test/org/codehaus/groovy/tools/CompilerTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/CompilerTest.java
rename to src/test/org/codehaus/groovy/tools/CompilerTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/DocGeneratorMain.java b/src/test/org/codehaus/groovy/tools/DocGeneratorMain.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/DocGeneratorMain.java
rename to src/test/org/codehaus/groovy/tools/DocGeneratorMain.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java b/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java
rename to src/test/org/codehaus/groovy/tools/FileSystemCompilerTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/LoaderConfigurationTest.groovy b/src/test/org/codehaus/groovy/tools/LoaderConfigurationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/LoaderConfigurationTest.groovy
rename to src/test/org/codehaus/groovy/tools/LoaderConfigurationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/MetaBuilderTest.groovy b/src/test/org/codehaus/groovy/tools/MetaBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/MetaBuilderTest.groovy
rename to src/test/org/codehaus/groovy/tools/MetaBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/StringHelperTest.groovy b/src/test/org/codehaus/groovy/tools/StringHelperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/StringHelperTest.groovy
rename to src/test/org/codehaus/groovy/tools/StringHelperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/TestDgmConverter.java b/src/test/org/codehaus/groovy/tools/TestDgmConverter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/TestDgmConverter.java
rename to src/test/org/codehaus/groovy/tools/TestDgmConverter.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/UtilitiesTest.groovy b/src/test/org/codehaus/groovy/tools/UtilitiesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/UtilitiesTest.groovy
rename to src/test/org/codehaus/groovy/tools/UtilitiesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/ast/TransformTestHelperTest.groovy b/src/test/org/codehaus/groovy/tools/ast/TransformTestHelperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/ast/TransformTestHelperTest.groovy
rename to src/test/org/codehaus/groovy/tools/ast/TransformTestHelperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java b/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/gse/DependencyTest.java
rename to src/test/org/codehaus/groovy/tools/gse/DependencyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGenericGroovySuperclass.groovy b/src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGenericGroovySuperclass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGenericGroovySuperclass.groovy
rename to src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGenericGroovySuperclass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGroovySuperclass.groovy b/src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGroovySuperclass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGroovySuperclass.groovy
rename to src/test/org/codehaus/groovy/tools/rootloadersync/AbstractGroovySuperclass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteGenericJavaSubclass.java b/src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteGenericJavaSubclass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteGenericJavaSubclass.java
rename to src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteGenericJavaSubclass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteJavaSubclass.java b/src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteJavaSubclass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteJavaSubclass.java
rename to src/test/org/codehaus/groovy/tools/rootloadersync/ConcreteJavaSubclass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteGenericJavaSubclass.java b/src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteGenericJavaSubclass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteGenericJavaSubclass.java
rename to src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteGenericJavaSubclass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteJavaSubclass.java b/src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteJavaSubclass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteJavaSubclass.java
rename to src/test/org/codehaus/groovy/tools/rootloadersync/OtherConcreteJavaSubclass.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInGroovyTest.groovy b/src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInGroovyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInGroovyTest.groovy
rename to src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInGroovyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInJavaTest.java b/src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInJavaTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInJavaTest.java
rename to src/test/org/codehaus/groovy/tools/rootloadersync/SubclassingInJavaTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationCollectorStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationCollectorStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationCollectorStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationCollectorStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationDefaultValuesStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationDefaultValuesStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationDefaultValuesStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationDefaultValuesStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV1StubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV2StubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV3StubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV4StubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV4StubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV4StubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/AnnotationMemberValuesResolutionV4StubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ArrayAnnotationsShouldAppearInStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/ArrayAnnotationsShouldAppearInStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ArrayAnnotationsShouldAppearInStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/ArrayAnnotationsShouldAppearInStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/BadGenericsExpansionOnInnerClassStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/BadGenericsExpansionOnInnerClassStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/BadGenericsExpansionOnInnerClassStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/BadGenericsExpansionOnInnerClassStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/DefaultValueReturnTypeShouldUseGenericsStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/DefaultValueReturnTypeShouldUseGenericsStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/DefaultValueReturnTypeShouldUseGenericsStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/DefaultValueReturnTypeShouldUseGenericsStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/DuplicateMethodAdditionInStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/EnsureClassAnnotationPresentInStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/EnsureClassAnnotationPresentInStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/EnsureClassAnnotationPresentInStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/EnsureClassAnnotationPresentInStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/EscapingOfStringAnnotationValuesTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/EscapingOfStringAnnotationValuesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/EscapingOfStringAnnotationValuesTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/EscapingOfStringAnnotationValuesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ExceptionThrowingSuperConstructorTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/ExceptionThrowingSuperConstructorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ExceptionThrowingSuperConstructorTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/ExceptionThrowingSuperConstructorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/GenericsTypesHavePackageNamesStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/GenericsTypesHavePackageNamesStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/GenericsTypesHavePackageNamesStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/GenericsTypesHavePackageNamesStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/GenericsWithExtendsStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/GenericsWithExtendsStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/GenericsWithExtendsStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/GenericsWithExtendsStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy4248Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy4248Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy4248Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy4248Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Support.java b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Support.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Support.java
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy5859Support.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6302Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6302Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6302Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6302Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6404Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6404Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6404Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6404Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6617Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6617Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6617Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6617Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6855Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6855Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6855Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy6855Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7052Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7052Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7052Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7052Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7113Bug.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7113Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7113Bug.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/Groovy7113Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationGroovy6836StubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationGroovy6836StubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationGroovy6836StubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationGroovy6836StubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/ImmutableWithJointCompilationStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ImportAliasesShouldNotAppearInStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/ImportAliasesShouldNotAppearInStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/ImportAliasesShouldNotAppearInStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/ImportAliasesShouldNotAppearInStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/InnerAnnotationStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/InnerAnnotationStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/InnerAnnotationStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/InnerAnnotationStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/InterfaceWithPrimitiveFieldsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/InterfaceWithPrimitiveFieldsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/InterfaceWithPrimitiveFieldsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/InterfaceWithPrimitiveFieldsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/MultilineStringStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/MultilineStringStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/MultilineStringStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/MultilineStringStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/NestedGenericsTypesStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/NestedGenericsTypesStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/NestedGenericsTypesStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/NestedGenericsTypesStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/NoStaticGetMetaClassSyntheticMethodInStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/NoStaticGetMetaClassSyntheticMethodInStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/NoStaticGetMetaClassSyntheticMethodInStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/NoStaticGetMetaClassSyntheticMethodInStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyWithCustomSetterHavingReturnTypeStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyWithCustomSetterHavingReturnTypeStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyWithCustomSetterHavingReturnTypeStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/PropertyWithCustomSetterHavingReturnTypeStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/QDoxCategory.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/QDoxCategory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/QDoxCategory.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/QDoxCategory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/RedundantCastInStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/RedundantCastInStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/RedundantCastInStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/RedundantCastInStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StringSourcesStubTestCase.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/StringSourcesStubTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StringSourcesStubTestCase.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/StringSourcesStubTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForAnAnnotationStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/StubGenerationForConstructorWithOptionalArgsStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StubTestCase.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/StubTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/StubTestCase.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/StubTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/UnAmbigousSuperConstructorCallStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/VarargsMethodParamsStubTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/VarargsMethodParamsStubTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/VarargsMethodParamsStubTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/VarargsMethodParamsStubTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/WrongCastForGenericReturnValueOfMethodStubsTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/WrongCastForGenericReturnValueOfMethodStubsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/tools/stubgenerator/WrongCastForGenericReturnValueOfMethodStubsTest.groovy
rename to src/test/org/codehaus/groovy/tools/stubgenerator/WrongCastForGenericReturnValueOfMethodStubsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/BaseScriptTransformTest.groovy b/src/test/org/codehaus/groovy/transform/BaseScriptTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/BaseScriptTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/BaseScriptTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/BuilderTransformTest.groovy b/src/test/org/codehaus/groovy/transform/BuilderTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/BuilderTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/BuilderTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/CanonicalComponentsTransformTest.groovy b/src/test/org/codehaus/groovy/transform/CanonicalComponentsTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/CanonicalComponentsTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/CanonicalComponentsTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/CanonicalTransformTest.groovy b/src/test/org/codehaus/groovy/transform/CanonicalTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/CanonicalTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/CanonicalTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ClassImplementingANonPublicInterface.java b/src/test/org/codehaus/groovy/transform/ClassImplementingANonPublicInterface.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ClassImplementingANonPublicInterface.java
rename to src/test/org/codehaus/groovy/transform/ClassImplementingANonPublicInterface.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy b/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/DelegateTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/FakeURLFactory.groovy b/src/test/org/codehaus/groovy/transform/FakeURLFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/FakeURLFactory.groovy
rename to src/test/org/codehaus/groovy/transform/FakeURLFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/FieldTransformTest.groovy b/src/test/org/codehaus/groovy/transform/FieldTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/FieldTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/FieldTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/GlobalTestTransformClassLoader.groovy b/src/test/org/codehaus/groovy/transform/GlobalTestTransformClassLoader.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/GlobalTestTransformClassLoader.groovy
rename to src/test/org/codehaus/groovy/transform/GlobalTestTransformClassLoader.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/GlobalTransformTest.groovy b/src/test/org/codehaus/groovy/transform/GlobalTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/GlobalTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/GlobalTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy b/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/ImmutableTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/IndexedPropertyTransformTest.groovy b/src/test/org/codehaus/groovy/transform/IndexedPropertyTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/IndexedPropertyTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/IndexedPropertyTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/InheritConstructorsTransformTest.groovy b/src/test/org/codehaus/groovy/transform/InheritConstructorsTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/InheritConstructorsTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/InheritConstructorsTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/LazyTransformTest.groovy b/src/test/org/codehaus/groovy/transform/LazyTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/LazyTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/LazyTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/LocalASTTransformTest.groovy b/src/test/org/codehaus/groovy/transform/LocalASTTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/LocalASTTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/LocalASTTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/test/org/codehaus/groovy/transform/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
rename to src/test/org/codehaus/groovy/transform/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/MemoizedASTTransformationTest.groovy b/src/test/org/codehaus/groovy/transform/MemoizedASTTransformationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/MemoizedASTTransformationTest.groovy
rename to src/test/org/codehaus/groovy/transform/MemoizedASTTransformationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/NewifyTransformTest.groovy b/src/test/org/codehaus/groovy/transform/NewifyTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/NewifyTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/NewifyTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/NonPublicInterface.java b/src/test/org/codehaus/groovy/transform/NonPublicInterface.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/NonPublicInterface.java
rename to src/test/org/codehaus/groovy/transform/NonPublicInterface.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/PackageScopeTransformTest.groovy b/src/test/org/codehaus/groovy/transform/PackageScopeTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/PackageScopeTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/PackageScopeTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ReadWriteLockTransformTest.groovy b/src/test/org/codehaus/groovy/transform/ReadWriteLockTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ReadWriteLockTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/ReadWriteLockTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SingletonASTTransformationTest.java b/src/test/org/codehaus/groovy/transform/SingletonASTTransformationTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SingletonASTTransformationTest.java
rename to src/test/org/codehaus/groovy/transform/SingletonASTTransformationTest.java
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SingletonTransformTest.groovy b/src/test/org/codehaus/groovy/transform/SingletonTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SingletonTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/SingletonTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SortableTransformTest.groovy b/src/test/org/codehaus/groovy/transform/SortableTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SortableTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/SortableTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SourceURITransformTest.groovy b/src/test/org/codehaus/groovy/transform/SourceURITransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SourceURITransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/SourceURITransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SynchronizedTransformTest.groovy b/src/test/org/codehaus/groovy/transform/SynchronizedTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/SynchronizedTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/SynchronizedTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/TestTransform.groovy b/src/test/org/codehaus/groovy/transform/TestTransform.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/TestTransform.groovy
rename to src/test/org/codehaus/groovy/transform/TestTransform.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ToStringTransformTest.groovy b/src/test/org/codehaus/groovy/transform/ToStringTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/ToStringTransformTest.groovy
rename to src/test/org/codehaus/groovy/transform/ToStringTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/classloading/TransformsAndCustomClassLoadersTest.groovy b/src/test/org/codehaus/groovy/transform/classloading/TransformsAndCustomClassLoadersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/classloading/TransformsAndCustomClassLoadersTest.groovy
rename to src/test/org/codehaus/groovy/transform/classloading/TransformsAndCustomClassLoadersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/stc/SignatureCodecTest.groovy b/src/test/org/codehaus/groovy/transform/stc/SignatureCodecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/stc/SignatureCodecTest.groovy
rename to src/test/org/codehaus/groovy/transform/stc/SignatureCodecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapperTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapperTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/ParameterMappingTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/ParameterMappingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/ParameterMappingTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/ParameterMappingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/RecursiveListExamples.groovy b/src/test/org/codehaus/groovy/transform/tailrec/RecursiveListExamples.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/RecursiveListExamples.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/RecursiveListExamples.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/RecursivenessTesterTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/RecursivenessTesterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/RecursivenessTesterTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/RecursivenessTesterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosuresTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosuresTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosuresTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/ReturnAdderForClosuresTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverterTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverterTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/ReturnStatementToIterationConverterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/StatementReplacerTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/StatementReplacerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/StatementReplacerTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/StatementReplacerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveCompilationFailuresTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveCompilationFailuresTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveCompilationFailuresTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveCompilationFailuresTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveExamples.groovy b/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveExamples.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveExamples.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveExamples.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTogetherWithOtherASTsTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTogetherWithOtherASTsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTogetherWithOtherASTsTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTogetherWithOtherASTsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTransformationTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTransformationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTransformationTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/TailRecursiveTransformationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverterTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverterTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/TernaryToIfStatementConverterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacerTest.groovy b/src/test/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacerTest.groovy
rename to src/test/org/codehaus/groovy/transform/tailrec/VariableExpressionReplacerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy6697Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy6697Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy6697Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy6697Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy6736Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy6736Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy6736Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy6736Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy6741Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy6741Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy6741Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy6741Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7011Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7011Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7011Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7011Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7190Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7190Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7190Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7190Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7196Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7196Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7196Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7196Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTrait.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTrait.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTrait.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTrait.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTraitImpl.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTraitImpl.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTraitImpl.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7196SupportTraitImpl.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7206Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7206Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7206Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7206Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7213Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7213Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7213Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7213Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7214Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7214Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7214Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7214Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7215Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7215Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7215Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7215Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7215SupportTrait.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7215SupportTrait.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7215SupportTrait.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7215SupportTrait.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7217Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7217Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7217Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7217Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7255Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7255Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7255Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7255Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7269Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7269Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7269Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7269Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7275Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7275Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7275Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7275Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7285Bug.groovy b/src/test/org/codehaus/groovy/transform/traitx/Groovy7285Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/Groovy7285Bug.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/Groovy7285Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/TestTrait2.groovy b/src/test/org/codehaus/groovy/transform/traitx/TestTrait2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/TestTrait2.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/TestTrait2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy b/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
rename to src/test/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/util/ListHashMapTest.groovy b/src/test/org/codehaus/groovy/util/ListHashMapTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/util/ListHashMapTest.groovy
rename to src/test/org/codehaus/groovy/util/ListHashMapTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/util/ManagedLinkedlistTest.groovy b/src/test/org/codehaus/groovy/util/ManagedLinkedlistTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/src/test/org/codehaus/groovy/util/ManagedLinkedlistTest.groovy
rename to src/test/org/codehaus/groovy/util/ManagedLinkedlistTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/build.gradle b/subprojects/groovy-ant/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/build.gradle
rename to subprojects/groovy-ant/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
rename to subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
rename to subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileIterator.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/LoggingHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/RootLoaderRef.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/package.html b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/package.html
rename to subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml b/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
rename to subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc b/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc
rename to subprojects/groovy-ant/src/spec/doc/ant-builder.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/spec/test/AntBuilderTest.groovy b/subprojects/groovy-ant/src/spec/test/AntBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/spec/test/AntBuilderTest.groovy
rename to subprojects/groovy-ant/src/spec/test/AntBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
rename to subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/groovy/util/AntTest.xml b/subprojects/groovy-ant/src/test-resources/groovy/util/AntTest.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/groovy/util/AntTest.xml
rename to subprojects/groovy-ant/src/test-resources/groovy/util/AntTest.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/groovy/util/AntTest_import.xml b/subprojects/groovy-ant/src/test-resources/groovy/util/AntTest_import.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/groovy/util/AntTest_import.xml
rename to subprojects/groovy-ant/src/test-resources/groovy/util/AntTest_import.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovyTest_errorMessage.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest2.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/IncorrectGenericsUsage.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy
rename to subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/groovytest3/GroovyTest3Class.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/AntTest.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/util/AntTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/AntTest.groovy
rename to subprojects/groovy-ant/src/test/groovy/groovy/util/AntTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/FileNameFinderTest.groovy b/subprojects/groovy-ant/src/test/groovy/groovy/util/FileNameFinderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/FileNameFinderTest.groovy
rename to subprojects/groovy-ant/src/test/groovy/groovy/util/FileNameFinderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTask.java b/subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTask.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTask.java
rename to subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTask.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTaskContainer.java b/subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTaskContainer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTaskContainer.java
rename to subprojects/groovy-ant/src/test/groovy/groovy/util/SpoofTaskContainer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
rename to subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy
rename to subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest2Class.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
rename to subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/build.gradle b/subprojects/groovy-bsf/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/build.gradle
rename to subprojects/groovy-bsf/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
rename to subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
rename to subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/package.html b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/package.html
rename to subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/spec/doc/integrating-bsf.adoc b/subprojects/groovy-bsf/src/spec/doc/integrating-bsf.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/spec/doc/integrating-bsf.adoc
rename to subprojects/groovy-bsf/src/spec/doc/integrating-bsf.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/spec/test/BSFSpecTest.java b/subprojects/groovy-bsf/src/spec/test/BSFSpecTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/spec/test/BSFSpecTest.java
rename to subprojects/groovy-bsf/src/spec/test/BSFSpecTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java
rename to subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
rename to subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/test/resources/groovy/script/MapFromList.groovy b/subprojects/groovy-bsf/src/test/resources/groovy/script/MapFromList.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-bsf/src/test/resources/groovy/script/MapFromList.groovy
rename to subprojects/groovy-bsf/src/test/resources/groovy/script/MapFromList.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/build.gradle b/subprojects/groovy-console/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/build.gradle
rename to subprojects/groovy-console/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/package.html b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/package.html
rename to subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleActions.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleApplet.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleIvyPlugin.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleTextEditor.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/ConsoleView.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/HistoryRecord.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/HistoryRecord.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/HistoryRecord.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/HistoryRecord.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/OutputTransforms.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/package.html b/subprojects/groovy-console/src/main/groovy/groovy/ui/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/package.html
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/AutoIndentAction.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/GroovyFilter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxHandler.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextEditor.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/TextUndoManager.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/package.html b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/package.html
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/text/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicContentPane.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicMenuBar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicStatusBar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/BasicToolBar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/Defaults.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXDefaults.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXMenuBar.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXMenuBar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXMenuBar.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/MacOSXMenuBar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy
rename to subprojects/groovy-console/src/main/groovy/groovy/ui/view/WindowsDefaults.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/inspect/swingui/AstBrowserProperties.groovy b/subprojects/groovy-console/src/main/resources/groovy/inspect/swingui/AstBrowserProperties.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/inspect/swingui/AstBrowserProperties.groovy
rename to subprojects/groovy-console/src/main/resources/groovy/inspect/swingui/AstBrowserProperties.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/ConsoleIcon.png b/subprojects/groovy-console/src/main/resources/groovy/ui/ConsoleIcon.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/ConsoleIcon.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/ConsoleIcon.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties b/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
rename to subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_redo.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_redo.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_redo.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_redo.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_undo.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_undo.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_undo.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/arrow_undo.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_next.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_next.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_next.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_next.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_previous.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_previous.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_previous.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/book_previous.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/bullet_green.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/bullet_green.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/bullet_green.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/bullet_green.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/credits.txt
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cross.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cross.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cross.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/cross.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut_red.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut_red.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut_red.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/cut_red.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/disk.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/disk.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/disk.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/disk.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/find.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/find.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/find.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/find.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/folder_page.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/folder_page.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/folder_page.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/folder_page.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/page.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_copy.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_copy.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_copy.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_copy.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_paste.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_paste.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_paste.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/page_paste.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/script_go.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/script_go.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/script_go.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/script_go.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/text_replace.png b/subprojects/groovy-console/src/main/resources/groovy/ui/icons/text_replace.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/main/resources/groovy/ui/icons/text_replace.png
rename to subprojects/groovy-console/src/main/resources/groovy/ui/icons/text_replace.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/GroovyConsole.gif b/subprojects/groovy-console/src/spec/doc/assets/img/GroovyConsole.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/GroovyConsole.gif
rename to subprojects/groovy-console/src/spec/doc/assets/img/GroovyConsole.gif
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/astbrowser.png b/subprojects/groovy-console/src/spec/doc/assets/img/astbrowser.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/astbrowser.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/astbrowser.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-with-visu.png b/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-with-visu.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-with-visu.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-with-visu.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-without-visu.png b/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-without-visu.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-without-visu.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-without-visu.png
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/groovy-console.adoc b/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
rename to subprojects/groovy-console/src/spec/doc/groovy-console.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy b/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy
rename to subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/AstNodeToScriptAdapterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy b/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy
rename to subprojects/groovy-console/src/test/groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy b/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
rename to subprojects/groovy-console/src/test/groovy/groovy/swing/SwingBuilderConsoleTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy b/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy
rename to subprojects/groovy-console/src/test/groovy/groovy/ui/HistoryRecordGetTextToRunTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy b/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy
rename to subprojects/groovy-console/src/test/groovy/groovy/ui/text/GroovyFilterTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/build.gradle b/subprojects/groovy-docgenerator/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/build.gradle
rename to subprojects/groovy-docgenerator/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
rename to subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/DocGenerator.properties b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/DocGenerator.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/DocGenerator.properties
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/DocGenerator.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/groovy.ico b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/groovy.ico
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/groovy.ico
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/groovy.ico
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/index.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/index.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/index.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/index.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/overview-summary.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/overview-summary.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/overview-summary.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/overview-summary.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/stylesheet.css
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.allclasses-frame.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.allclasses-frame.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.allclasses-frame.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.allclasses-frame.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.class.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.class.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.class.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.class.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.index-all.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.index-all.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.index-all.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.index-all.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.overview-frame.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.overview-frame.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.overview-frame.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.overview-frame.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-frame.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-frame.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-frame.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-frame.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-summary.html b/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-summary.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-summary.html
rename to subprojects/groovy-docgenerator/src/main/resources/org/codehaus/groovy/tools/template.package-summary.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/build.gradle b/subprojects/groovy-groovydoc/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/build.gradle
rename to subprojects/groovy-groovydoc/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy b/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
rename to subprojects/groovy-groovydoc/src/main/groovy/org/codehaus/groovy/tools/groovydoc/Main.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyAnnotationRef.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyAnnotationRef.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyAnnotationRef.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyAnnotationRef.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyClassDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyClassDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyClassDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyConstructorDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyConstructorDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyConstructorDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyConstructorDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDocErrorReporter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDocErrorReporter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDocErrorReporter.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyDocErrorReporter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyExecutableMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyExecutableMemberDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyExecutableMemberDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyExecutableMemberDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyFieldDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyFieldDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyFieldDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyFieldDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMemberDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMemberDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMemberDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMethodDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMethodDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMethodDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyMethodDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyPackageDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyPackageDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyPackageDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyPackageDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyParameter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyParameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyParameter.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyParameter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyProgramElementDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyProgramElementDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyProgramElementDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyProgramElementDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyRootDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyRootDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyRootDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyRootDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyTag.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyTag.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyTag.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyTag.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/GroovyType.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/package.html b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/package.html
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/groovydoc/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ArrayClassDocWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ClasspathResourceManager.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileOutputTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileOutputTool.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileOutputTool.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileOutputTool.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileSystemResourceManager.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileSystemResourceManager.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileSystemResourceManager.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/FileSystemResourceManager.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTool.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/LinkArgument.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/LinkArgument.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/LinkArgument.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/LinkArgument.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/MockOutputTool.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/OutputTool.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/OutputTool.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/OutputTool.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/OutputTool.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ResourceManager.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ResourceManager.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ResourceManager.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ResourceManager.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAbstractableElementDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAbstractableElementDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAbstractableElementDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAbstractableElementDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAnnotationRef.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAnnotationRef.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAnnotationRef.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyAnnotationRef.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyConstructorDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyFieldDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMemberDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyMethodDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyTag.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyTag.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyTag.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyTag.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyType.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyType.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyType.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/package.html b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/package.html
rename to subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/Main.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocStructuredData.xml b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocStructuredData.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocStructuredData.xml
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocStructuredData.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-frame.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-frame.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-frame.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-frame.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-summary.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-summary.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-summary.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/package-summary.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/packageDocStructuredData.xml b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/packageDocStructuredData.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/packageDocStructuredData.xml
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/packageLevel/packageDocStructuredData.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/allclasses-frame.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/allclasses-frame.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/allclasses-frame.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/allclasses-frame.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/deprecated-list.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/help-doc.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index-all.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/index.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/inherit.gif b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/inherit.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/inherit.gif
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/inherit.gif
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-frame.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-frame.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-frame.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-frame.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-summary.html b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-summary.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-summary.html
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/overview-summary.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/rootDocStructuredData.xml b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/rootDocStructuredData.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/rootDocStructuredData.xml
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/rootDocStructuredData.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css b/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
rename to subprojects/groovy-groovydoc/src/main/resources/org/codehaus/groovy/tools/groovydoc/gstringTemplates/topLevel/stylesheet.css
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc b/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc
rename to subprojects/groovy-groovydoc/src/spec/doc/groovydoc.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/CustomGroovyDoc.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTestSampleGroovy.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTestSampleGroovy.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTestSampleGroovy.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTestSampleGroovy.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilderTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocTests.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocTests.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDocTests.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Alias.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Alias.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Alias.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Alias.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ArrayPropertyLink.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ArrayPropertyLink.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ArrayPropertyLink.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ArrayPropertyLink.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Builder.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Builder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Builder.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/Builder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithAnonymousInnerClass.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithAnonymousInnerClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithAnonymousInnerClass.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithAnonymousInnerClass.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithMethodComment.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithMethodComment.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithMethodComment.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ClassWithMethodComment.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedClass.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedClass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedClass.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedClass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedField.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedField.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedField.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DeprecatedField.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DocumentedClass.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DocumentedClass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DocumentedClass.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/DocumentedClass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/EnumWithDeprecatedConstants.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/EnumWithDeprecatedConstants.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/EnumWithDeprecatedConstants.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/EnumWithDeprecatedConstants.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityG.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityG.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityG.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityG.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityJ.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityJ.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityJ.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/ExampleVisibilityJ.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyClassWithMultipleInterfaces.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyClassWithMultipleInterfaces.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyClassWithMultipleInterfaces.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyClassWithMultipleInterfaces.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterface1.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterface1.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterface1.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterface1.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterfaceWithMultipleInterfaces.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterfaceWithMultipleInterfaces.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterfaceWithMultipleInterfaces.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/GroovyInterfaceWithMultipleInterfaces.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerClassProperty.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerClassProperty.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerClassProperty.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerClassProperty.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerEnum.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerEnum.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerEnum.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/InnerEnum.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaClassWithMultipleInterfaces.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaClassWithMultipleInterfaces.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaClassWithMultipleInterfaces.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaClassWithMultipleInterfaces.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterface1.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterface1.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterface1.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterface1.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterfaceWithMultipleInterfaces.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterfaceWithMultipleInterfaces.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterfaceWithMultipleInterfaces.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/JavaInterfaceWithMultipleInterfaces.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/MultipleConstructorErrorBug.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/MultipleConstructorErrorBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/MultipleConstructorErrorBug.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/MultipleConstructorErrorBug.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/PropertyLink.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/PropertyLink.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/PropertyLink.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/PropertyLink.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/StaticModifier.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/StaticModifier.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/StaticModifier.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/StaticModifier.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/TestConstructors.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/TestConstructors.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/TestConstructors.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/TestConstructors.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/Base.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/Base.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/Base.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/Base.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantA.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantA.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantA.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantA.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantC.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantC.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantC.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantC.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantD.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantD.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantD.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/a/DescendantD.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/Base.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/Base.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/Base.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/Base.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/DescendantB.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/DescendantB.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/DescendantB.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/b/DescendantB.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantE.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantE.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantE.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantE.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantF.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantF.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantF.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/c/DescendantF.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/GroovyWithFailingStaticInit.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/GroovyWithFailingStaticInit.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/GroovyWithFailingStaticInit.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/GroovyWithFailingStaticInit.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/JavaWithFailingStaticInit.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/JavaWithFailingStaticInit.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/JavaWithFailingStaticInit.java
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/JavaWithFailingStaticInit.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/UsesClassesWithFailingStaticInit.groovy b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/UsesClassesWithFailingStaticInit.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/UsesClassesWithFailingStaticInit.groovy
rename to subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/staticInit/UsesClassesWithFailingStaticInit.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml b/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
rename to subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/resources/org/codehaus/groovy/tools/groovydoc/testfiles/classDocName.html b/subprojects/groovy-groovydoc/src/test/resources/org/codehaus/groovy/tools/groovydoc/testfiles/classDocName.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovydoc/src/test/resources/org/codehaus/groovy/tools/groovydoc/testfiles/classDocName.html
rename to subprojects/groovy-groovydoc/src/test/resources/org/codehaus/groovy/tools/groovydoc/testfiles/classDocName.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/build.gradle b/subprojects/groovy-groovysh/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/build.gradle
rename to subprojects/groovy-groovysh/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedCandidateListCompletionHandler.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedCandidateListCompletionHandler.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedCandidateListCompletionHandler.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedCandidateListCompletionHandler.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedConsoleReader.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedConsoleReader.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedConsoleReader.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/PatchedConsoleReader.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/JAnsiHelper.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/JAnsiHelper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/JAnsiHelper.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/JAnsiHelper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
rename to subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AllCompletorsTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AllCompletorsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AllCompletorsTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AllCompletorsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AnsiDetectorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AnsiDetectorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AnsiDetectorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AnsiDetectorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CommandCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CommandCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CommandCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CommandCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CompletorTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CompletorTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CompletorTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CompletorTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ErrorDisplayTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ErrorDisplayTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ErrorDisplayTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ErrorDisplayTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshParsersTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshParsersTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshParsersTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshParsersTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ImportCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ImportCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ImportCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ImportCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/CommandTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/CommandTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/CommandTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/CommandTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ComplexCommandSupportTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ComplexCommandSupportTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ComplexCommandSupportTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ComplexCommandSupportTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DocCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DocCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DocCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DocCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EchoCommand.properties b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EchoCommand.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EchoCommand.properties
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EchoCommand.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EditCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EditCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EditCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EditCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SetCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SetCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SetCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SetCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommandTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommandTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleterTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleterTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/KeywordCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/KeywordCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/KeywordCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/KeywordCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleterTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleterTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/TokenUtilTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/TokenUtilTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/TokenUtilTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/TokenUtilTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/VariableCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/VariableCompletorTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/VariableCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/VariableCompletorTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ClassWithPrivateConstructor.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ClassWithPrivateConstructor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ClassWithPrivateConstructor.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ClassWithPrivateConstructor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ExprTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ExprTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ExprTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ExprTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/TimeItTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/TimeItTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/TimeItTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/TimeItTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParserTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParserTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParserTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParserTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexerTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexerTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/MessageSourceTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/MessageSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/MessageSourceTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/MessageSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImplTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImplTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImplTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImplTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzerTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzerTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStreamTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStreamTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStreamTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStreamTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties b/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
rename to subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/build.gradle b/subprojects/groovy-jmx/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/build.gradle
rename to subprojects/groovy-jmx/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/package-info.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/package-info.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/package-info.groovy
rename to subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/package-info.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
rename to subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/spec/doc/jmx.adoc b/subprojects/groovy-jmx/src/spec/doc/jmx.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/spec/doc/jmx.adoc
rename to subprojects/groovy-jmx/src/spec/doc/jmx.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/spec/test/JmxTest.groovy b/subprojects/groovy-jmx/src/spec/test/JmxTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/spec/test/JmxTest.groovy
rename to subprojects/groovy-jmx/src/spec/test/JmxTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxAttributeInfoManagerTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxAttributeInfoManagerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxAttributeInfoManagerTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxAttributeInfoManagerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanInfoManagerTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanInfoManagerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanInfoManagerTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanInfoManagerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBuilderToolsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxClientConnectorFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxClientConnectorFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxClientConnectorFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxClientConnectorFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmbeddedMetaMapBuilderTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmbeddedMetaMapBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmbeddedMetaMapBuilderTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmbeddedMetaMapBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmitterFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmitterFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmitterFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxEmitterFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxListenerFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxListenerFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxListenerFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxListenerFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxMetaMapBuilderTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxMetaMapBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxMetaMapBuilderTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxMetaMapBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxOperationInfoManagerTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxOperationInfoManagerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxOperationInfoManagerTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxOperationInfoManagerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxServerConnectorFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxServerConnectorFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxServerConnectorFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxServerConnectorFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockEmbeddedClass.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockEmbeddedClass.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockEmbeddedClass.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockEmbeddedClass.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockManagedGroovyObject.groovy b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockManagedGroovyObject.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockManagedGroovyObject.groovy
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/MockManagedGroovyObject.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java b/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
rename to subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/JmxConnectorHelper.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/JmxConnectorHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/JmxConnectorHelper.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/JmxConnectorHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockJmxListener.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockJmxListener.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockJmxListener.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockJmxListener.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockManagedObject.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockManagedObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockManagedObject.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockManagedObject.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObject.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObject.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObject.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObject.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObjectMBean.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObjectMBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObjectMBean.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/builder/MockSimpleObjectMBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java b/subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java
rename to subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java b/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
rename to subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/build.gradle b/subprojects/groovy-json/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/build.gradle
rename to subprojects/groovy-json/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonException.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
rename to subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
rename to subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java b/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java
rename to subprojects/groovy-json/src/main/java/groovy/json/StringEscapeUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ArrayUtils.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ArrayUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ArrayUtils.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ArrayUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Byt.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Byt.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Byt.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Byt.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ByteScanner.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ByteScanner.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ByteScanner.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ByteScanner.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Cache.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Cache.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Cache.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Cache.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CacheType.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/CacheType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CacheType.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/CacheType.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharBuf.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/CharBuf.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharBuf.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/CharBuf.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharScanner.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/CharScanner.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharScanner.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/CharScanner.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharacterSource.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/CharacterSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/CharacterSource.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/CharacterSource.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Charsets.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Charsets.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Charsets.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Charsets.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Chr.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Chr.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Chr.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Chr.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Dates.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Dates.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Dates.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Dates.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Exceptions.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Exceptions.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Exceptions.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Exceptions.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/FastStringUtils.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/FastStringUtils.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/FastStringUtils.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/FastStringUtils.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/IO.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/IO.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/IO.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/IO.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/JsonFastParser.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserCharArray.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserCharArray.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserCharArray.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserCharArray.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserLax.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserLax.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserLax.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserLax.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserUsingCharacterSource.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserUsingCharacterSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserUsingCharacterSource.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/JsonParserUsingCharacterSource.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonStringDecoder.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonStringDecoder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/JsonStringDecoder.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/JsonStringDecoder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/MapItemValue.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ReaderCharacterSource.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ReaderCharacterSource.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ReaderCharacterSource.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ReaderCharacterSource.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/SimpleCache.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/SimpleCache.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/SimpleCache.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/SimpleCache.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Sys.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Sys.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Sys.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Sys.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Type.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Type.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Type.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Type.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Value.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/Value.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/Value.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/Value.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueContainer.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueContainer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueContainer.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ValueContainer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueList.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueList.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueList.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ValueList.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMap.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMap.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMap.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
rename to subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/doc/json-builder.adoc b/subprojects/groovy-json/src/spec/doc/json-builder.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/doc/json-builder.adoc
rename to subprojects/groovy-json/src/spec/doc/json-builder.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/doc/json-userguide.adoc b/subprojects/groovy-json/src/spec/doc/json-userguide.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/doc/json-userguide.adoc
rename to subprojects/groovy-json/src/spec/doc/json-userguide.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/doc/streaming-jason-builder.adoc b/subprojects/groovy-json/src/spec/doc/streaming-jason-builder.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/doc/streaming-jason-builder.adoc
rename to subprojects/groovy-json/src/spec/doc/streaming-jason-builder.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/JsonBuilderTest2.groovy b/subprojects/groovy-json/src/spec/test/JsonBuilderTest2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/JsonBuilderTest2.groovy
rename to subprojects/groovy-json/src/spec/test/JsonBuilderTest2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/StreamingJsonBuilderTest2.groovy b/subprojects/groovy-json/src/spec/test/StreamingJsonBuilderTest2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/StreamingJsonBuilderTest2.groovy
rename to subprojects/groovy-json/src/spec/test/StreamingJsonBuilderTest2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy b/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy
rename to subprojects/groovy-json/src/spec/test/json/JsonBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy b/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/json/JsonTest.groovy
rename to subprojects/groovy-json/src/spec/test/json/JsonTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
rename to subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperCharSourceTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperCharSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperCharSourceTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperCharSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperIndexOverlayTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperIndexOverlayTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperIndexOverlayTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperIndexOverlayTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperLaxTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ArrayUtilsTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ArrayUtilsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ArrayUtilsTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/ArrayUtilsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/CharScannerTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/CharScannerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/CharScannerTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/CharScannerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ChrTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ChrTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ChrTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/ChrTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsUnsafeDisabledTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsUnsafeDisabledTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsUnsafeDisabledTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/FastStringUtilsUnsafeDisabledTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/LazyMapTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/LazyMapTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/LazyMapTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/LazyMapTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ReaderCharacterSourceTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ReaderCharacterSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-json/src/test/groovy/groovy/json/internal/ReaderCharacterSourceTest.groovy
rename to subprojects/groovy-json/src/test/groovy/groovy/json/internal/ReaderCharacterSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/build.gradle b/subprojects/groovy-jsr223/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/build.gradle
rename to subprojects/groovy-jsr223/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
rename to subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
rename to subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
rename to subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
rename to subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java
rename to subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/subprojects/groovy-jsr223/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
rename to subprojects/groovy-jsr223/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/spec/doc/integrating-jsr223.adoc b/subprojects/groovy-jsr223/src/spec/doc/integrating-jsr223.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/spec/doc/integrating-jsr223.adoc
rename to subprojects/groovy-jsr223/src/spec/doc/integrating-jsr223.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/spec/test/JSR223SpecTest.java b/subprojects/groovy-jsr223/src/spec/test/JSR223SpecTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/spec/test/JSR223SpecTest.java
rename to subprojects/groovy-jsr223/src/spec/test/JSR223SpecTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy b/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
rename to subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/SugarTest.groovy b/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/SugarTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/SugarTest.groovy
rename to subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/SugarTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/vm6/JavascriptTest.groovy b/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/vm6/JavascriptTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/vm6/JavascriptTest.groovy
rename to subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/vm6/JavascriptTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java b/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
rename to subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/build.gradle b/subprojects/groovy-nio/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/build.gradle
rename to subprojects/groovy-nio/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
rename to subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
rename to subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/src/test/groovy/org/codehaus/groovy/runtime/NioGroovyMethodsTest.groovy b/subprojects/groovy-nio/src/test/groovy/org/codehaus/groovy/runtime/NioGroovyMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-nio/src/test/groovy/org/codehaus/groovy/runtime/NioGroovyMethodsTest.groovy
rename to subprojects/groovy-nio/src/test/groovy/org/codehaus/groovy/runtime/NioGroovyMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/build.gradle b/subprojects/groovy-servlet/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/build.gradle
rename to subprojects/groovy-servlet/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
rename to subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
rename to subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
rename to subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletCategory.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletCategory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletCategory.java
rename to subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletCategory.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
rename to subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/package.html b/subprojects/groovy-servlet/src/main/java/groovy/servlet/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/main/java/groovy/servlet/package.html
rename to subprojects/groovy-servlet/src/main/java/groovy/servlet/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/spec/doc/servlet-userguide.adoc b/subprojects/groovy-servlet/src/spec/doc/servlet-userguide.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/spec/doc/servlet-userguide.adoc
rename to subprojects/groovy-servlet/src/spec/doc/servlet-userguide.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/spec/test/servlet/GroovyServletTest.groovy b/subprojects/groovy-servlet/src/spec/test/servlet/GroovyServletTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/spec/test/servlet/GroovyServletTest.groovy
rename to subprojects/groovy-servlet/src/spec/test/servlet/GroovyServletTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/test/groovy/groovy/servlet/AbstractHttpServletTest.groovy b/subprojects/groovy-servlet/src/test/groovy/groovy/servlet/AbstractHttpServletTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/test/groovy/groovy/servlet/AbstractHttpServletTest.groovy
rename to subprojects/groovy-servlet/src/test/groovy/groovy/servlet/AbstractHttpServletTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/test/groovy/groovy/servlet/ServletBindingTest.groovy b/subprojects/groovy-servlet/src/test/groovy/groovy/servlet/ServletBindingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/test/groovy/groovy/servlet/ServletBindingTest.groovy
rename to subprojects/groovy-servlet/src/test/groovy/groovy/servlet/ServletBindingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/test/java/groovy/servlet/GroovyServletTest.java b/subprojects/groovy-servlet/src/test/java/groovy/servlet/GroovyServletTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-servlet/src/test/java/groovy/servlet/GroovyServletTest.java
rename to subprojects/groovy-servlet/src/test/java/groovy/servlet/GroovyServletTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/build.gradle b/subprojects/groovy-sql/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/build.gradle
rename to subprojects/groovy-sql/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java b/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingStatementWrapper.java b/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingStatementWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingStatementWrapper.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/BatchingStatementWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/CallResultSet.java b/subprojects/groovy-sql/src/main/java/groovy/sql/CallResultSet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/CallResultSet.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/CallResultSet.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java b/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ExpandedVariable.java b/subprojects/groovy-sql/src/main/java/groovy/sql/ExpandedVariable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ExpandedVariable.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/ExpandedVariable.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ExtractIndexAndSql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/ExtractIndexAndSql.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ExtractIndexAndSql.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/ExtractIndexAndSql.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSet.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSet.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSet.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSet.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/GroovyRowResult.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/InOutParameter.java b/subprojects/groovy-sql/src/main/java/groovy/sql/InOutParameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/InOutParameter.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/InOutParameter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/InParameter.java b/subprojects/groovy-sql/src/main/java/groovy/sql/InParameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/InParameter.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/InParameter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/OutParameter.java b/subprojects/groovy-sql/src/main/java/groovy/sql/OutParameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/OutParameter.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/OutParameter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java b/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetOutParameter.java b/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetOutParameter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetOutParameter.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetOutParameter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/SqlOrderByVisitor.java b/subprojects/groovy-sql/src/main/java/groovy/sql/SqlOrderByVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/SqlOrderByVisitor.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/SqlOrderByVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java b/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWithParams.java b/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWithParams.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWithParams.java
rename to subprojects/groovy-sql/src/main/java/groovy/sql/SqlWithParams.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/package.html b/subprojects/groovy-sql/src/main/java/groovy/sql/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/groovy/sql/package.html
rename to subprojects/groovy-sql/src/main/java/groovy/sql/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java b/subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java
rename to subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/bugs/ForAndSqlBug.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/bugs/ForAndSqlBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/bugs/ForAndSqlBug.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/bugs/ForAndSqlBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/bugs/Groovy5041Bug.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/bugs/Groovy5041Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/bugs/Groovy5041Bug.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/bugs/Groovy5041Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/ExtractIndexAndSqlTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/ExtractIndexAndSqlTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/ExtractIndexAndSqlTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/ExtractIndexAndSqlTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/GroovyRowResultTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/GroovyRowResultTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/GroovyRowResultTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/GroovyRowResultTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/Person.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/Person.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/Person.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/Person.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/PersonTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/PersonTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/PersonTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/PersonTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlBatchTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlBatchTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlBatchTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlBatchTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCacheTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCacheTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCacheTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCacheTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCallTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCallTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCallTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCallTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteWithoutDataSourceTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteWithoutDataSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteWithoutDataSourceTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteWithoutDataSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlHelperTestCase.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlHelperTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlHelperTestCase.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlHelperTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlRowsTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlRowsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlRowsTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlRowsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlStatementTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlStatementTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlStatementTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlStatementTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTestConstants.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTestConstants.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTestConstants.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTestConstants.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionConnectionTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionConnectionTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionConnectionTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionConnectionTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionDataSourceTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionDataSourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionDataSourceTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionDataSourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionTestCase.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionTestCase.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlTransactionTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithBuilderTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithBuilderTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithTypedResultsTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithTypedResultsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithTypedResultsTest.groovy
rename to subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlWithTypedResultsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/build.gradle b/subprojects/groovy-swing/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/build.gradle
rename to subprojects/groovy-swing/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticMetaMethods.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticMetaMethods.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticMetaMethods.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/package.html b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/package.html
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BeanFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BeanFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BeanFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BeanFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindGroupFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindProxyFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CollectionFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CollectionFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CollectionFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CollectionFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CompoundBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CompoundBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CompoundBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CompoundBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LineBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LineBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LineBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LineBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MapFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MapFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MapFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MapFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TextArgWidgetFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TextArgWidgetFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TextArgWidgetFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TextArgWidgetFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/package.html b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/package.html
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/package.html b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/package.html
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/package.html b/subprojects/groovy-swing/src/main/groovy/groovy/swing/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/groovy/groovy/swing/package.html
rename to subprojects/groovy-swing/src/main/groovy/groovy/swing/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
rename to subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
rename to subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java b/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java b/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/package.html b/subprojects/groovy-swing/src/main/java/groovy/model/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/groovy/model/package.html
rename to subprojects/groovy-swing/src/main/java/groovy/model/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/MutualPropertyBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SourceBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TargetBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/TriggerBinding.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
rename to subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/spec/assets/img/SwingBuilder001.gif b/subprojects/groovy-swing/src/spec/assets/img/SwingBuilder001.gif
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/spec/assets/img/SwingBuilder001.gif
rename to subprojects/groovy-swing/src/spec/assets/img/SwingBuilder001.gif
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/spec/doc/swing-builder.adoc b/subprojects/groovy-swing/src/spec/doc/swing-builder.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/spec/doc/swing-builder.adoc
rename to subprojects/groovy-swing/src/spec/doc/swing-builder.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/spec/test/SwingBuilderTest.groovy b/subprojects/groovy-swing/src/spec/test/SwingBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/spec/test/SwingBuilderTest.groovy
rename to subprojects/groovy-swing/src/spec/test/SwingBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/ClosureSwingListenerTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java b/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/StrangeBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java b/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/StrangeBeanBeanInfo.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java b/subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java
rename to subprojects/groovy-swing/src/test/groovy/groovy/StrangeEventListener.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/beans/BindableSwingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/beans/VetoableSwingTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/bugs/Groovy303_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/bugs/PropertyBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/model/TableModelTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/BindPathTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/BindPathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/BindPathTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/BindPathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderBindingsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTableTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingMetaMethodsTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingMetaMethodsTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingMetaMethodsTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/SwingMetaMethodsTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/TitledBorderFactoryJustificationTest.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/swing/TitledBorderFactoryJustificationTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/swing/TitledBorderFactoryJustificationTest.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/swing/TitledBorderFactoryJustificationTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy b/subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy
rename to subprojects/groovy-swing/src/test/groovy/groovy/util/GroovySwingTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java b/subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java
rename to subprojects/groovy-swing/src/test/groovy/org/codehaus/groovy/runtime/DummyBean.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/build.gradle
rename to subprojects/groovy-templates/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/Template.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/Template.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/Template.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/Template.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateExecutionException.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateExecutionException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateExecutionException.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateExecutionException.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateParseException.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateParseException.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateParseException.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateParseException.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/XmlTemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/AutoNewLineTransformer.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/AutoNewLineTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/AutoNewLineTransformer.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/AutoNewLineTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/BaseTemplate.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/DelegatingIndentWriter.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/DelegatingIndentWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/DelegatingIndentWriter.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/DelegatingIndentWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/IncludeType.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/IncludeType.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/IncludeType.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/IncludeType.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TagLibAdapter.groovy b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TagLibAdapter.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TagLibAdapter.groovy
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TagLibAdapter.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateASTTransformer.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateASTTransformer.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateASTTransformer.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateASTTransformer.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateConfiguration.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateResolver.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateResolver.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateResolver.java
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/TemplateResolver.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/package.html b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/package.html
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/markup/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/package.html b/subprojects/groovy-templates/src/main/groovy/groovy/text/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/main/groovy/groovy/text/package.html
rename to subprojects/groovy-templates/src/main/groovy/groovy/text/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc b/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
rename to subprojects/groovy-templates/src/spec/doc/markup-template-engine.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/doc/template-engines.adoc b/subprojects/groovy-templates/src/spec/doc/template-engines.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/doc/template-engines.adoc
rename to subprojects/groovy-templates/src/spec/doc/template-engines.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/layout-main.tpl b/subprojects/groovy-templates/src/spec/test-resources/layout-main.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/layout-main.tpl
rename to subprojects/groovy-templates/src/spec/test-resources/layout-main.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/locale_include.tpl b/subprojects/groovy-templates/src/spec/test-resources/locale_include.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/locale_include.tpl
rename to subprojects/groovy-templates/src/spec/test-resources/locale_include.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/locale_include_fr_FR.tpl b/subprojects/groovy-templates/src/spec/test-resources/locale_include_fr_FR.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/locale_include_fr_FR.tpl
rename to subprojects/groovy-templates/src/spec/test-resources/locale_include_fr_FR.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/main.tpl b/subprojects/groovy-templates/src/spec/test-resources/main.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/main.tpl
rename to subprojects/groovy-templates/src/spec/test-resources/main.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/other_template.tpl b/subprojects/groovy-templates/src/spec/test-resources/other_template.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/other_template.tpl
rename to subprojects/groovy-templates/src/spec/test-resources/other_template.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/raw.txt b/subprojects/groovy-templates/src/spec/test-resources/raw.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/raw.txt
rename to subprojects/groovy-templates/src/spec/test-resources/raw.txt
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/to_be_escaped.txt b/subprojects/groovy-templates/src/spec/test-resources/to_be_escaped.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test-resources/to_be_escaped.txt
rename to subprojects/groovy-templates/src/spec/test-resources/to_be_escaped.txt
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy b/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
rename to subprojects/groovy-templates/src/spec/test/MarkupTemplateEngineSpecTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test/MyTemplate.groovy b/subprojects/groovy-templates/src/spec/test/MyTemplate.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test/MyTemplate.groovy
rename to subprojects/groovy-templates/src/spec/test/MyTemplate.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy b/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy
rename to subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/SimpleGStringTemplateEngineTest.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/SimpleGStringTemplateEngineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/SimpleGStringTemplateEngineTest.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/SimpleGStringTemplateEngineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/SimpleTemplateEngineTest.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/SimpleTemplateEngineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/SimpleTemplateEngineTest.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/SimpleTemplateEngineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java b/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java
rename to subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/MarkupTemplateEngineTest.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/text/MarkupTemplateEngineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/MarkupTemplateEngineTest.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/text/MarkupTemplateEngineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/SimpleTemplateTest.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/text/SimpleTemplateTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/SimpleTemplateTest.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/text/SimpleTemplateTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineSpecification.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineTest.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineTest.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/text/StreamingTemplateEngineTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/markup/TemplateResourceTest.groovy b/subprojects/groovy-templates/src/test/groovy/groovy/text/markup/TemplateResourceTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/groovy/groovy/text/markup/TemplateResourceTest.groovy
rename to subprojects/groovy-templates/src/test/groovy/groovy/text/markup/TemplateResourceTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/java/groovy/text/TemplateTest.java b/subprojects/groovy-templates/src/test/java/groovy/text/TemplateTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/java/groovy/text/TemplateTest.java
rename to subprojects/groovy-templates/src/test/java/groovy/text/TemplateTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/java/groovy/text/XmlTemplateEngineTest.java b/subprojects/groovy-templates/src/test/java/groovy/text/XmlTemplateEngineTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/java/groovy/text/XmlTemplateEngineTest.java
rename to subprojects/groovy-templates/src/test/java/groovy/text/XmlTemplateEngineTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/body.tpl b/subprojects/groovy-templates/src/test/resources/includes/body.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/body.tpl
rename to subprojects/groovy-templates/src/test/resources/includes/body.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello-escaped.txt b/subprojects/groovy-templates/src/test/resources/includes/hello-escaped.txt
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello-escaped.txt
rename to subprojects/groovy-templates/src/test/resources/includes/hello-escaped.txt
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello.html b/subprojects/groovy-templates/src/test/resources/includes/hello.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello.html
rename to subprojects/groovy-templates/src/test/resources/includes/hello.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello.tpl b/subprojects/groovy-templates/src/test/resources/includes/hello.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello.tpl
rename to subprojects/groovy-templates/src/test/resources/includes/hello.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello_fr_FR.tpl b/subprojects/groovy-templates/src/test/resources/includes/hello_fr_FR.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/hello_fr_FR.tpl
rename to subprojects/groovy-templates/src/test/resources/includes/hello_fr_FR.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/typecheckedinclude.tpl b/subprojects/groovy-templates/src/test/resources/includes/typecheckedinclude.tpl
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-templates/src/test/resources/includes/typecheckedinclude.tpl
rename to subprojects/groovy-templates/src/test/resources/includes/typecheckedinclude.tpl
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/build.gradle b/subprojects/groovy-test/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/build.gradle
rename to subprojects/groovy-test/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Demand.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Demand.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Demand.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Demand.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Ignore.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Ignore.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Ignore.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/Ignore.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/LooseExpectation.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/LooseExpectation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/LooseExpectation.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/LooseExpectation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockFor.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockFor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockFor.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockFor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockInterceptor.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockInterceptor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockInterceptor.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/MockInterceptor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StrictExpectation.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StrictExpectation.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StrictExpectation.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StrictExpectation.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StubFor.groovy b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StubFor.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StubFor.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/StubFor.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/package.html b/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/package.html
rename to subprojects/groovy-test/src/main/groovy/groovy/mock/interceptor/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/util/GroovyShellTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy
rename to subprojects/groovy-test/src/main/groovy/groovy/util/StringTestUtil.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java b/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
rename to subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/test/GroovyAssert.java b/subprojects/groovy-test/src/main/java/groovy/test/GroovyAssert.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/test/GroovyAssert.java
rename to subprojects/groovy-test/src/main/java/groovy/test/GroovyAssert.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
rename to subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java
rename to subprojects/groovy-test/src/main/java/groovy/util/AllTestSuite.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/GroovyAssert.java b/subprojects/groovy-test/src/main/java/groovy/util/GroovyAssert.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/GroovyAssert.java
rename to subprojects/groovy-test/src/main/java/groovy/util/GroovyAssert.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
rename to subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java
rename to subprojects/groovy-test/src/main/java/groovy/util/GroovyTestSuite.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java b/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java
rename to subprojects/groovy-test/src/main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java b/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
rename to subprojects/groovy-test/src/main/java/org/codehaus/groovy/transform/NotYetImplementedASTTransformation.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy b/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
rename to subprojects/groovy-test/src/test/groovy/GroovyTestCaseTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy
rename to subprojects/groovy-test/src/test/groovy/groovy/lang/GroovyLogTestCaseTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
rename to subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyAssertTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyAssertTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/test/GroovyAssertTest.groovy
rename to subprojects/groovy-test/src/test/groovy/groovy/test/GroovyAssertTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy b/subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy
rename to subprojects/groovy-test/src/test/groovy/groovy/util/AllTestSuiteTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/util/suite/ATestScriptThatsNoTestCase.groovy b/subprojects/groovy-test/src/test/groovy/groovy/util/suite/ATestScriptThatsNoTestCase.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/groovy/util/suite/ATestScriptThatsNoTestCase.groovy
rename to subprojects/groovy-test/src/test/groovy/groovy/util/suite/ATestScriptThatsNoTestCase.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/org/codehaus/groovy/transform/NotYetImplementedTransformTest.groovy b/subprojects/groovy-test/src/test/groovy/org/codehaus/groovy/transform/NotYetImplementedTransformTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-test/src/test/groovy/org/codehaus/groovy/transform/NotYetImplementedTransformTest.groovy
rename to subprojects/groovy-test/src/test/groovy/org/codehaus/groovy/transform/NotYetImplementedTransformTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-testng/build.gradle b/subprojects/groovy-testng/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-testng/build.gradle
rename to subprojects/groovy-testng/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java b/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
rename to subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-testng/src/main/resources/META-INF/services/org.codehaus.groovy.plugins.Runners b/subprojects/groovy-testng/src/main/resources/META-INF/services/org.codehaus.groovy.plugins.Runners
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-testng/src/main/resources/META-INF/services/org.codehaus.groovy.plugins.Runners
rename to subprojects/groovy-testng/src/main/resources/META-INF/services/org.codehaus.groovy.plugins.Runners
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/build.gradle b/subprojects/groovy-xml/build.gradle
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/build.gradle
rename to subprojects/groovy-xml/build.gradle
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/Entity.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/Entity.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/Entity.groovy
rename to subprojects/groovy-xml/src/main/groovy/groovy/xml/Entity.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StaxBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StaxBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StaxBuilder.groovy
rename to subprojects/groovy-xml/src/main/groovy/groovy/xml/StaxBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
rename to subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
rename to subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
rename to subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
rename to subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrinter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/GPathResult.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/GPathResult.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/GPathResult.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/GPathResult.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NamespaceAwareHashMap.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NamespaceAwareHashMap.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NamespaceAwareHashMap.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NamespaceAwareHashMap.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NoChildren.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NoChildren.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NoChildren.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NoChildren.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Node.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Node.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Node.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Node.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeIterator.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeIterator.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeIterator.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeIterator.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeParents.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeParents.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeParents.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeParents.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/ReplacementNode.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/ReplacementNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/ReplacementNode.java
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/ReplacementNode.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/package.html b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/package.html
rename to subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java b/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/Namespace.java b/subprojects/groovy-xml/src/main/java/groovy/xml/Namespace.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/Namespace.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/Namespace.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilder.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java b/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/dom/package.html b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/dom/package.html
rename to subprojects/groovy-xml/src/main/java/groovy/xml/dom/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/package.html b/subprojects/groovy-xml/src/main/java/groovy/xml/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/package.html
rename to subprojects/groovy-xml/src/main/java/groovy/xml/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/BaseMarkupBuilder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/Builder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/Builder.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/Builder.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/Builder.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/package.html b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/package.html
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/package.html
rename to subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/package.html
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java
rename to subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
rename to subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/doc/xml-userguide.adoc b/subprojects/groovy-xml/src/spec/doc/xml-userguide.adoc
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/doc/xml-userguide.adoc
rename to subprojects/groovy-xml/src/spec/doc/xml-userguide.adoc
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/DomBuilderTest.groovy b/subprojects/groovy-xml/src/spec/test/DomBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/DomBuilderTest.groovy
rename to subprojects/groovy-xml/src/spec/test/DomBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/MarkupBuilderTest2.groovy b/subprojects/groovy-xml/src/spec/test/MarkupBuilderTest2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/MarkupBuilderTest2.groovy
rename to subprojects/groovy-xml/src/spec/test/MarkupBuilderTest2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/SaxBuilderTest.groovy b/subprojects/groovy-xml/src/spec/test/SaxBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/SaxBuilderTest.groovy
rename to subprojects/groovy-xml/src/spec/test/SaxBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/StreamingMarkupBuilderTest2.groovy b/subprojects/groovy-xml/src/spec/test/StreamingMarkupBuilderTest2.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/StreamingMarkupBuilderTest2.groovy
rename to subprojects/groovy-xml/src/spec/test/StreamingMarkupBuilderTest2.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideDOMCategory.groovy b/subprojects/groovy-xml/src/spec/test/UserGuideDOMCategory.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideDOMCategory.groovy
rename to subprojects/groovy-xml/src/spec/test/UserGuideDOMCategory.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideMarkupBuilderTest.groovy b/subprojects/groovy-xml/src/spec/test/UserGuideMarkupBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideMarkupBuilderTest.groovy
rename to subprojects/groovy-xml/src/spec/test/UserGuideMarkupBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideStreamingMarkupBuilderTest.groovy b/subprojects/groovy-xml/src/spec/test/UserGuideStreamingMarkupBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideStreamingMarkupBuilderTest.groovy
rename to subprojects/groovy-xml/src/spec/test/UserGuideStreamingMarkupBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideXmlParserTest.groovy b/subprojects/groovy-xml/src/spec/test/UserGuideXmlParserTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideXmlParserTest.groovy
rename to subprojects/groovy-xml/src/spec/test/UserGuideXmlParserTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideXmlSlurperTest.groovy b/subprojects/groovy-xml/src/spec/test/UserGuideXmlSlurperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideXmlSlurperTest.groovy
rename to subprojects/groovy-xml/src/spec/test/UserGuideXmlSlurperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideXmlUtilTest.groovy b/subprojects/groovy-xml/src/spec/test/UserGuideXmlUtilTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/spec/test/UserGuideXmlUtilTest.groovy
rename to subprojects/groovy-xml/src/spec/test/UserGuideXmlUtilTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy249_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy4285Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy4285Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy4285Bug.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy4285Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy593_Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy593_Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy593_Bug.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy593_Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy_2473Bug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy_2473Bug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy_2473Bug.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/Groovy_2473Bug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/MarkupInScriptBug.java b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/MarkupInScriptBug.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/MarkupInScriptBug.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/MarkupInScriptBug.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/StaticMarkupBug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/StaticMarkupBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/StaticMarkupBug.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/StaticMarkupBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/TedsClosureBug.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/bugs/TedsClosureBug.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/bugs/TedsClosureBug.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/bugs/TedsClosureBug.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/CustomNode.java b/subprojects/groovy-xml/src/test/groovy/groovy/util/CustomNode.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/CustomNode.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/util/CustomNode.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/CustomXmlParser.java b/subprojects/groovy-xml/src/test/groovy/groovy/util/CustomXmlParser.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/CustomXmlParser.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/util/CustomXmlParser.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlNodePrinterTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlNodePrinterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlNodePrinterTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/util/XmlNodePrinterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlParserTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlParserTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlParserTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/util/XmlParserTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlSlurperTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlSlurperTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/util/XmlSlurperTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/util/XmlSlurperTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/BuilderTestSupport.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/BuilderTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/BuilderTestSupport.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/BuilderTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/DOMTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/FactorySupportTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/GpathSyntaxTestSupport.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/GpathSyntaxTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/GpathSyntaxTestSupport.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/GpathSyntaxTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupWithWriterTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/MixedMarkupTestSupport.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/MixedMarkupTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/MixedMarkupTestSupport.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/MixedMarkupTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeGPathTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/NamespaceNodeTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/SAXTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingMarkupBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingMarkupBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingMarkupBuilderTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingMarkupBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/StreamingSAXBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/TestXmlSupport.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/TestXmlSupport.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/TestXmlSupport.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/TestXmlSupport.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/TraversalTestSupport.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/TraversalTestSupport.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/TraversalTestSupport.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/TraversalTestSupport.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/UseMarkupWithWriterScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/VerboseDOMTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlTest.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlTest.java
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlTest.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlTest.java
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMCategoryTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/DOMTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/vm6/StaxBuilderTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/vm6/StaxBuilderTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/groovy/xml/vm6/StaxBuilderTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/vm6/StaxBuilderTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/benchmarks/BuilderPerfTest.groovy b/subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/benchmarks/BuilderPerfTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/benchmarks/BuilderPerfTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/benchmarks/BuilderPerfTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/tools/xml/DomToGroovyTest.groovy b/subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/tools/xml/DomToGroovyTest.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/tools/xml/DomToGroovyTest.groovy
rename to subprojects/groovy-xml/src/test/groovy/org/codehaus/groovy/tools/xml/DomToGroovyTest.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/script/AtomTestScript.groovy b/subprojects/groovy-xml/src/test/groovy/script/AtomTestScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/script/AtomTestScript.groovy
rename to subprojects/groovy-xml/src/test/groovy/script/AtomTestScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/script/MarkupTestScript.groovy b/subprojects/groovy-xml/src/test/groovy/script/MarkupTestScript.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/script/MarkupTestScript.groovy
rename to subprojects/groovy-xml/src/test/groovy/script/MarkupTestScript.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/util/NavToWiki.groovy b/subprojects/groovy-xml/src/test/groovy/util/NavToWiki.groovy
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/groovy/util/NavToWiki.groovy
rename to subprojects/groovy-xml/src/test/groovy/util/NavToWiki.groovy
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/po.xsd b/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/po.xsd
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/po.xsd
rename to subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/po.xsd
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing.xml b/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing.xml
rename to subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing2.xml b/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing2.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing2.xml
rename to subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/swing2.xml
diff --git a/groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/test1.xml b/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/test1.xml
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/test1.xml
rename to subprojects/groovy-xml/src/test/resources/org/codehaus/groovy/tools/xml/test1.xml
diff --git a/groovy/upstream/groovy-2.4.3/xdocs/images/groovy-logo.png b/xdocs/images/groovy-logo.png
similarity index 100%
rename from groovy/upstream/groovy-2.4.3/xdocs/images/groovy-logo.png
rename to xdocs/images/groovy-logo.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git
More information about the pkg-java-commits
mailing list