diff --git a/trunk/COPYRIGHT.txt b/COPYRIGHT.txt
similarity index 100%
rename from trunk/COPYRIGHT.txt
rename to COPYRIGHT.txt
diff --git a/trunk/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from trunk/LICENSE.txt
rename to LICENSE.txt
diff --git a/trunk/MMTk/.classpath b/MMTk/.classpath
similarity index 100%
rename from trunk/MMTk/.classpath
rename to MMTk/.classpath
diff --git a/trunk/MMTk/.project b/MMTk/.project
similarity index 100%
rename from trunk/MMTk/.project
rename to MMTk/.project
diff --git a/trunk/MMTk/LICENSE.txt b/MMTk/LICENSE.txt
similarity index 100%
rename from trunk/MMTk/LICENSE.txt
rename to MMTk/LICENSE.txt
diff --git a/trunk/MMTk/doc/cheatsheet/cheatsheet.pdf b/MMTk/doc/cheatsheet/cheatsheet.pdf
similarity index 100%
rename from trunk/MMTk/doc/cheatsheet/cheatsheet.pdf
rename to MMTk/doc/cheatsheet/cheatsheet.pdf
diff --git a/trunk/MMTk/doc/cheatsheet/cheatsheet.tex b/MMTk/doc/cheatsheet/cheatsheet.tex
similarity index 100%
rename from trunk/MMTk/doc/cheatsheet/cheatsheet.tex
rename to MMTk/doc/cheatsheet/cheatsheet.tex
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/ActivePlan.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Assert.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Barriers.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/BuildTimeConfig.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Factory.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/FinalizableProcessor.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/MMTkEvents.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/ObjectModel.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/ReferenceProcessor.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/ReferenceProcessor.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/ReferenceProcessor.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/ReferenceProcessor.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Scanning.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Scanning.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Scanning.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Scanning.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Statistics.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Statistics.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Statistics.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Statistics.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Strings.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/Strings.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/Strings.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/Strings.java
diff --git a/trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/SynchronizedCounter.java b/MMTk/ext/vm/harness/org/mmtk/harness/vm/SynchronizedCounter.java
similarity index 100%
rename from trunk/MMTk/ext/vm/harness/org/mmtk/harness/vm/SynchronizedCounter.java
rename to MMTk/ext/vm/harness/org/mmtk/harness/vm/SynchronizedCounter.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ActivePlan.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ActivePlan.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ActivePlan.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ActivePlan.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Assert.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Assert.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Assert.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Assert.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/BuildTimeConfig.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/BuildTimeConfig.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/BuildTimeConfig.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/BuildTimeConfig.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Collection.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Factory.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Factory.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Factory.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Factory.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Lock.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/MMTk_Events.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/MMTk_Events.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/MMTk_Events.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/MMTk_Events.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ObjectModel.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ReferenceProcessor.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanBootImage.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanBootImage.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanBootImage.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanBootImage.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanStatics.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanStatics.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanStatics.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanStatics.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Scanning.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Scanning.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Scanning.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Scanning.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Statistics.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Statistics.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Statistics.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Statistics.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Strings.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Strings.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Strings.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Strings.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/SynchronizedCounter.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/SynchronizedCounter.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/SynchronizedCounter.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/SynchronizedCounter.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/TraceInterface.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/TraceInterface.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/TraceInterface.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/TraceInterface.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ByteStream.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ByteStream.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ByteStream.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ByteStream.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/IntStream.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/IntStream.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/IntStream.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/IntStream.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerInterpreter.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerInterpreter.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerInterpreter.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerInterpreter.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerSpace.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerSpace.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerSpace.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ServerSpace.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ShortStream.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ShortStream.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ShortStream.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/ShortStream.java
diff --git a/trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/Util.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/Util.java
similarity index 100%
rename from trunk/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/Util.java
rename to MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/gcspy/Util.java
diff --git a/trunk/MMTk/harness/src-generated/org/mmtk/harness/lang/parser/Parser.jj b/MMTk/harness/src-generated/org/mmtk/harness/lang/parser/Parser.jj
similarity index 100%
rename from trunk/MMTk/harness/src-generated/org/mmtk/harness/lang/parser/Parser.jj
rename to MMTk/harness/src-generated/org/mmtk/harness/lang/parser/Parser.jj
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/Collector.java b/MMTk/harness/src/org/mmtk/harness/Collector.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/Collector.java
rename to MMTk/harness/src/org/mmtk/harness/Collector.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/Harness.java b/MMTk/harness/src/org/mmtk/harness/Harness.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/Harness.java
rename to MMTk/harness/src/org/mmtk/harness/Harness.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/MMTkThread.java b/MMTk/harness/src/org/mmtk/harness/MMTkThread.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/MMTkThread.java
rename to MMTk/harness/src/org/mmtk/harness/MMTkThread.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/Main.java b/MMTk/harness/src/org/mmtk/harness/Main.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/Main.java
rename to MMTk/harness/src/org/mmtk/harness/Main.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/Mutator.java b/MMTk/harness/src/org/mmtk/harness/Mutator.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/Mutator.java
rename to MMTk/harness/src/org/mmtk/harness/Mutator.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Checker.java b/MMTk/harness/src/org/mmtk/harness/lang/Checker.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Checker.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Checker.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Compiler.java b/MMTk/harness/src/org/mmtk/harness/lang/Compiler.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Compiler.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Compiler.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Declaration.java b/MMTk/harness/src/org/mmtk/harness/lang/Declaration.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Declaration.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Declaration.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Env.java b/MMTk/harness/src/org/mmtk/harness/lang/Env.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Env.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Env.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Intrinsics.java b/MMTk/harness/src/org/mmtk/harness/lang/Intrinsics.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Intrinsics.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Intrinsics.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/PrettyPrinter.java b/MMTk/harness/src/org/mmtk/harness/lang/PrettyPrinter.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/PrettyPrinter.java
rename to MMTk/harness/src/org/mmtk/harness/lang/PrettyPrinter.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Trace.java b/MMTk/harness/src/org/mmtk/harness/lang/Trace.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Trace.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Trace.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/UnsyncStack.java b/MMTk/harness/src/org/mmtk/harness/lang/UnsyncStack.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/UnsyncStack.java
rename to MMTk/harness/src/org/mmtk/harness/lang/UnsyncStack.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/Visitor.java b/MMTk/harness/src/org/mmtk/harness/lang/Visitor.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/Visitor.java
rename to MMTk/harness/src/org/mmtk/harness/lang/Visitor.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/AST.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/AST.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/AST.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/AST.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/AbstractAST.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/AbstractAST.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/AbstractAST.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/AbstractAST.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Alloc.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Alloc.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Alloc.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Alloc.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Assert.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Assert.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Assert.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Assert.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Assignment.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Assignment.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Assignment.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Assignment.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/BinaryExpression.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/BinaryExpression.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/BinaryExpression.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/BinaryExpression.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Call.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Call.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Call.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Call.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Constant.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Constant.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Constant.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Constant.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Empty.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Empty.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Empty.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Empty.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Expect.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Expect.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Expect.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Expect.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Expression.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Expression.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Expression.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Expression.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/IfStatement.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/IfStatement.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/IfStatement.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/IfStatement.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/IntrinsicMethod.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/IntrinsicMethod.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/IntrinsicMethod.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/IntrinsicMethod.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/LoadField.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/LoadField.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/LoadField.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/LoadField.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Method.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Method.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Method.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Method.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/MethodProxy.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/MethodProxy.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/MethodProxy.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/MethodProxy.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/NormalMethod.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/NormalMethod.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/NormalMethod.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/NormalMethod.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Operator.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Operator.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Operator.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Operator.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/PrintStatement.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/PrintStatement.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/PrintStatement.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/PrintStatement.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Return.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Return.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Return.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Return.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Sequence.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Sequence.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Sequence.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Sequence.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Spawn.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Spawn.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Spawn.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Spawn.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Statement.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Statement.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Statement.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Statement.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/StoreField.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/StoreField.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/StoreField.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/StoreField.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Type.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Type.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Type.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Type.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/UnaryExpression.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/UnaryExpression.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/UnaryExpression.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/UnaryExpression.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Variable.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/Variable.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/Variable.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/Variable.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/WhileStatement.java b/MMTk/harness/src/org/mmtk/harness/lang/ast/WhileStatement.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/ast/WhileStatement.java
rename to MMTk/harness/src/org/mmtk/harness/lang/ast/WhileStatement.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethod.java b/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethod.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethod.java
rename to MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethod.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodProxy.java b/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodProxy.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodProxy.java
rename to MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodProxy.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodTable.java b/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodTable.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodTable.java
rename to MMTk/harness/src/org/mmtk/harness/lang/compiler/CompiledMethodTable.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/Register.java b/MMTk/harness/src/org/mmtk/harness/lang/compiler/Register.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/Register.java
rename to MMTk/harness/src/org/mmtk/harness/lang/compiler/Register.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/Temporary.java b/MMTk/harness/src/org/mmtk/harness/lang/compiler/Temporary.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/compiler/Temporary.java
rename to MMTk/harness/src/org/mmtk/harness/lang/compiler/Temporary.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/MethodTable.java b/MMTk/harness/src/org/mmtk/harness/lang/parser/MethodTable.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/MethodTable.java
rename to MMTk/harness/src/org/mmtk/harness/lang/parser/MethodTable.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/Source.java b/MMTk/harness/src/org/mmtk/harness/lang/parser/Source.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/Source.java
rename to MMTk/harness/src/org/mmtk/harness/lang/parser/Source.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/Symbol.java b/MMTk/harness/src/org/mmtk/harness/lang/parser/Symbol.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/Symbol.java
rename to MMTk/harness/src/org/mmtk/harness/lang/parser/Symbol.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/SymbolTable.java b/MMTk/harness/src/org/mmtk/harness/lang/parser/SymbolTable.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/parser/SymbolTable.java
rename to MMTk/harness/src/org/mmtk/harness/lang/parser/SymbolTable.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/AllocOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/AllocOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/AllocOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/AllocOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOperation.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOperation.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOperation.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/BinaryOperation.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/Branch.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/Branch.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/Branch.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/Branch.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallIntrinsicOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallIntrinsicOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallIntrinsicOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/CallIntrinsicOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallNormalOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallNormalOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallNormalOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/CallNormalOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/CallOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/CallOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/EnnaryOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/EnnaryOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/EnnaryOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/EnnaryOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExitOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExitOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExitOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/ExitOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExpectOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExpectOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ExpectOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/ExpectOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/Goto.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/Goto.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/Goto.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/Goto.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/LoadFieldOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/LoadFieldOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/LoadFieldOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/LoadFieldOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/NullaryOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/NullaryOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/NullaryOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/NullaryOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/PrintOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/PrintOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/PrintOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/PrintOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/PseudoOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/PseudoOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/PseudoOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/PseudoOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ResolvableOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/ResolvableOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ResolvableOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/ResolvableOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ReturnOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/ReturnOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/ReturnOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/ReturnOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/SpawnOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/SpawnOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/SpawnOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/SpawnOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreFieldOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreFieldOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreFieldOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreFieldOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreLocal.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreLocal.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreLocal.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/StoreLocal.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/TernaryOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/TernaryOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/TernaryOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/TernaryOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOp.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOp.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOp.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOp.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOperation.java b/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOperation.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOperation.java
rename to MMTk/harness/src/org/mmtk/harness/lang/pcode/UnaryOperation.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/AllocationSite.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/AllocationSite.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/AllocationSite.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/AllocationSite.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/BoolValue.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/BoolValue.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/BoolValue.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/BoolValue.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/ConstantPool.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/ConstantPool.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/ConstantPool.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/ConstantPool.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/IntValue.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/IntValue.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/IntValue.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/IntValue.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/ObjectValue.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/ObjectValue.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/ObjectValue.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/ObjectValue.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/PcodeInterpreter.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/PcodeInterpreter.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/PcodeInterpreter.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/PcodeInterpreter.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/StackFrame.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/StackFrame.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/StackFrame.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/StackFrame.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/StringValue.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/StringValue.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/StringValue.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/StringValue.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/Value.java b/MMTk/harness/src/org/mmtk/harness/lang/runtime/Value.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/lang/runtime/Value.java
rename to MMTk/harness/src/org/mmtk/harness/lang/runtime/Value.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/Bits.java b/MMTk/harness/src/org/mmtk/harness/options/Bits.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/Bits.java
rename to MMTk/harness/src/org/mmtk/harness/options/Bits.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/Collectors.java b/MMTk/harness/src/org/mmtk/harness/options/Collectors.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/Collectors.java
rename to MMTk/harness/src/org/mmtk/harness/options/Collectors.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/DumpPcode.java b/MMTk/harness/src/org/mmtk/harness/options/DumpPcode.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/DumpPcode.java
rename to MMTk/harness/src/org/mmtk/harness/options/DumpPcode.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/GcEvery.java b/MMTk/harness/src/org/mmtk/harness/options/GcEvery.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/GcEvery.java
rename to MMTk/harness/src/org/mmtk/harness/options/GcEvery.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/HarnessOptionSet.java b/MMTk/harness/src/org/mmtk/harness/options/HarnessOptionSet.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/HarnessOptionSet.java
rename to MMTk/harness/src/org/mmtk/harness/options/HarnessOptionSet.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/InitHeap.java b/MMTk/harness/src/org/mmtk/harness/options/InitHeap.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/InitHeap.java
rename to MMTk/harness/src/org/mmtk/harness/options/InitHeap.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/MaxHeap.java b/MMTk/harness/src/org/mmtk/harness/options/MaxHeap.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/MaxHeap.java
rename to MMTk/harness/src/org/mmtk/harness/options/MaxHeap.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/Plan.java b/MMTk/harness/src/org/mmtk/harness/options/Plan.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/Plan.java
rename to MMTk/harness/src/org/mmtk/harness/options/Plan.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/PolicyStats.java b/MMTk/harness/src/org/mmtk/harness/options/PolicyStats.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/PolicyStats.java
rename to MMTk/harness/src/org/mmtk/harness/options/PolicyStats.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyLength.java b/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyLength.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyLength.java
rename to MMTk/harness/src/org/mmtk/harness/options/RandomPolicyLength.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMax.java b/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMax.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMax.java
rename to MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMax.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMin.java b/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMin.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMin.java
rename to MMTk/harness/src/org/mmtk/harness/options/RandomPolicyMin.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicySeed.java b/MMTk/harness/src/org/mmtk/harness/options/RandomPolicySeed.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/RandomPolicySeed.java
rename to MMTk/harness/src/org/mmtk/harness/options/RandomPolicySeed.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/Scheduler.java b/MMTk/harness/src/org/mmtk/harness/options/Scheduler.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/Scheduler.java
rename to MMTk/harness/src/org/mmtk/harness/options/Scheduler.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/SchedulerPolicy.java b/MMTk/harness/src/org/mmtk/harness/options/SchedulerPolicy.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/SchedulerPolicy.java
rename to MMTk/harness/src/org/mmtk/harness/options/SchedulerPolicy.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/Trace.java b/MMTk/harness/src/org/mmtk/harness/options/Trace.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/Trace.java
rename to MMTk/harness/src/org/mmtk/harness/options/Trace.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/options/YieldInterval.java b/MMTk/harness/src/org/mmtk/harness/options/YieldInterval.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/options/YieldInterval.java
rename to MMTk/harness/src/org/mmtk/harness/options/YieldInterval.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/AbstractPolicy.java b/MMTk/harness/src/org/mmtk/harness/scheduler/AbstractPolicy.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/AbstractPolicy.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/AbstractPolicy.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Lock.java b/MMTk/harness/src/org/mmtk/harness/scheduler/Lock.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Lock.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/Lock.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Policy.java b/MMTk/harness/src/org/mmtk/harness/scheduler/Policy.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Policy.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/Policy.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Schedulable.java b/MMTk/harness/src/org/mmtk/harness/scheduler/Schedulable.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Schedulable.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/Schedulable.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Scheduler.java b/MMTk/harness/src/org/mmtk/harness/scheduler/Scheduler.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/Scheduler.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/Scheduler.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/ThreadModel.java b/MMTk/harness/src/org/mmtk/harness/scheduler/ThreadModel.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/ThreadModel.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/ThreadModel.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldAlways.java b/MMTk/harness/src/org/mmtk/harness/scheduler/YieldAlways.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldAlways.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/YieldAlways.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldEvery.java b/MMTk/harness/src/org/mmtk/harness/scheduler/YieldEvery.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldEvery.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/YieldEvery.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldNever.java b/MMTk/harness/src/org/mmtk/harness/scheduler/YieldNever.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldNever.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/YieldNever.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldRandomly.java b/MMTk/harness/src/org/mmtk/harness/scheduler/YieldRandomly.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/YieldRandomly.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/YieldRandomly.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaLock.java b/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaLock.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaLock.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaLock.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThread.java b/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThread.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThread.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThread.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThreadModel.java b/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThreadModel.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThreadModel.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/JavaThreadModel.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/Rendezvous.java b/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/Rendezvous.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/Rendezvous.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/javathreads/Rendezvous.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawLock.java b/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawLock.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawLock.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawLock.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThread.java b/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThread.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThread.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThread.java
diff --git a/trunk/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThreadModel.java b/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThreadModel.java
similarity index 100%
rename from trunk/MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThreadModel.java
rename to MMTk/harness/src/org/mmtk/harness/scheduler/rawthreads/RawThreadModel.java
diff --git a/trunk/MMTk/harness/test-scripts/Alignment.script b/MMTk/harness/test-scripts/Alignment.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/Alignment.script
rename to MMTk/harness/test-scripts/Alignment.script
diff --git a/trunk/MMTk/harness/test-scripts/CyclicGarbage.script b/MMTk/harness/test-scripts/CyclicGarbage.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/CyclicGarbage.script
rename to MMTk/harness/test-scripts/CyclicGarbage.script
diff --git a/trunk/MMTk/harness/test-scripts/HashCode.script b/MMTk/harness/test-scripts/HashCode.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/HashCode.script
rename to MMTk/harness/test-scripts/HashCode.script
diff --git a/trunk/MMTk/harness/test-scripts/LargeObject.script b/MMTk/harness/test-scripts/LargeObject.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/LargeObject.script
rename to MMTk/harness/test-scripts/LargeObject.script
diff --git a/trunk/MMTk/harness/test-scripts/OutOfMemory.script b/MMTk/harness/test-scripts/OutOfMemory.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/OutOfMemory.script
rename to MMTk/harness/test-scripts/OutOfMemory.script
diff --git a/trunk/MMTk/harness/test-scripts/Quicksort.options b/MMTk/harness/test-scripts/Quicksort.options
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/Quicksort.options
rename to MMTk/harness/test-scripts/Quicksort.options
diff --git a/trunk/MMTk/harness/test-scripts/Quicksort.script b/MMTk/harness/test-scripts/Quicksort.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/Quicksort.script
rename to MMTk/harness/test-scripts/Quicksort.script
diff --git a/trunk/MMTk/harness/test-scripts/README b/MMTk/harness/test-scripts/README
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/README
rename to MMTk/harness/test-scripts/README
diff --git a/trunk/MMTk/harness/test-scripts/Spawn.options b/MMTk/harness/test-scripts/Spawn.options
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/Spawn.options
rename to MMTk/harness/test-scripts/Spawn.options
diff --git a/trunk/MMTk/harness/test-scripts/Spawn.script b/MMTk/harness/test-scripts/Spawn.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/Spawn.script
rename to MMTk/harness/test-scripts/Spawn.script
diff --git a/trunk/MMTk/harness/test-scripts/SpreadAlloc.options b/MMTk/harness/test-scripts/SpreadAlloc.options
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/SpreadAlloc.options
rename to MMTk/harness/test-scripts/SpreadAlloc.options
diff --git a/trunk/MMTk/harness/test-scripts/SpreadAlloc.script b/MMTk/harness/test-scripts/SpreadAlloc.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/SpreadAlloc.script
rename to MMTk/harness/test-scripts/SpreadAlloc.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/README b/MMTk/harness/test-scripts/lang/README
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/README
rename to MMTk/harness/test-scripts/lang/README
diff --git a/trunk/MMTk/harness/test-scripts/lang/alloc.script b/MMTk/harness/test-scripts/lang/alloc.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/alloc.script
rename to MMTk/harness/test-scripts/lang/alloc.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/assert.script b/MMTk/harness/test-scripts/lang/assert.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/assert.script
rename to MMTk/harness/test-scripts/lang/assert.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/assign.script b/MMTk/harness/test-scripts/lang/assign.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/assign.script
rename to MMTk/harness/test-scripts/lang/assign.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/call.script b/MMTk/harness/test-scripts/lang/call.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/call.script
rename to MMTk/harness/test-scripts/lang/call.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/const.script b/MMTk/harness/test-scripts/lang/const.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/const.script
rename to MMTk/harness/test-scripts/lang/const.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/expr.script b/MMTk/harness/test-scripts/lang/expr.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/expr.script
rename to MMTk/harness/test-scripts/lang/expr.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/fields.script b/MMTk/harness/test-scripts/lang/fields.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/fields.script
rename to MMTk/harness/test-scripts/lang/fields.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/getfield.script b/MMTk/harness/test-scripts/lang/getfield.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/getfield.script
rename to MMTk/harness/test-scripts/lang/getfield.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/if-then-else.script b/MMTk/harness/test-scripts/lang/if-then-else.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/if-then-else.script
rename to MMTk/harness/test-scripts/lang/if-then-else.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/if-then-else2.script b/MMTk/harness/test-scripts/lang/if-then-else2.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/if-then-else2.script
rename to MMTk/harness/test-scripts/lang/if-then-else2.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/intrinsic.script b/MMTk/harness/test-scripts/lang/intrinsic.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/intrinsic.script
rename to MMTk/harness/test-scripts/lang/intrinsic.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/list.script b/MMTk/harness/test-scripts/lang/list.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/list.script
rename to MMTk/harness/test-scripts/lang/list.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/recursive1.script b/MMTk/harness/test-scripts/lang/recursive1.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/recursive1.script
rename to MMTk/harness/test-scripts/lang/recursive1.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/recursive2.script b/MMTk/harness/test-scripts/lang/recursive2.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/recursive2.script
rename to MMTk/harness/test-scripts/lang/recursive2.script
diff --git a/trunk/MMTk/harness/test-scripts/lang/while.script b/MMTk/harness/test-scripts/lang/while.script
similarity index 100%
rename from trunk/MMTk/harness/test-scripts/lang/while.script
rename to MMTk/harness/test-scripts/lang/while.script
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Address.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/Address.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Address.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/Address.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/AddressArray.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/AddressArray.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/AddressArray.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/AddressArray.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord32.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord32.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord32.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord32.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord64.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord64.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord64.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/ArchitecturalWord64.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Architecture.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/Architecture.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Architecture.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/Architecture.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Extent.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/Extent.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Extent.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/Extent.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ExtentArray.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/ExtentArray.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ExtentArray.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/ExtentArray.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReference.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReference.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReference.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReference.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Offset.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/Offset.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Offset.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/Offset.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/OffsetArray.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/OffsetArray.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/OffsetArray.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/OffsetArray.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/SimulatedMemory.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/SimulatedMemory.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/SimulatedMemory.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/SimulatedMemory.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Word.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/Word.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/Word.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/Word.java
diff --git a/trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/WordArray.java b/MMTk/harness/vmmagic/org/vmmagic/unboxed/WordArray.java
similarity index 100%
rename from trunk/MMTk/harness/vmmagic/org/vmmagic/unboxed/WordArray.java
rename to MMTk/harness/vmmagic/org/vmmagic/unboxed/WordArray.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/CollectorContext.java b/MMTk/src/org/mmtk/plan/CollectorContext.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/CollectorContext.java
rename to MMTk/src/org/mmtk/plan/CollectorContext.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/ComplexPhase.java b/MMTk/src/org/mmtk/plan/ComplexPhase.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/ComplexPhase.java
rename to MMTk/src/org/mmtk/plan/ComplexPhase.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/GCspyPlan.java b/MMTk/src/org/mmtk/plan/GCspyPlan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/GCspyPlan.java
rename to MMTk/src/org/mmtk/plan/GCspyPlan.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/MutatorContext.java b/MMTk/src/org/mmtk/plan/MutatorContext.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/MutatorContext.java
rename to MMTk/src/org/mmtk/plan/MutatorContext.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/Phase.java b/MMTk/src/org/mmtk/plan/Phase.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/Phase.java
rename to MMTk/src/org/mmtk/plan/Phase.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/Plan.java b/MMTk/src/org/mmtk/plan/Plan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/Plan.java
rename to MMTk/src/org/mmtk/plan/Plan.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java b/MMTk/src/org/mmtk/plan/PlanConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/PlanConstraints.java
rename to MMTk/src/org/mmtk/plan/PlanConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/Simple.java b/MMTk/src/org/mmtk/plan/Simple.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/Simple.java
rename to MMTk/src/org/mmtk/plan/Simple.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/SimpleCollector.java b/MMTk/src/org/mmtk/plan/SimpleCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/SimpleCollector.java
rename to MMTk/src/org/mmtk/plan/SimpleCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/SimpleConstraints.java b/MMTk/src/org/mmtk/plan/SimpleConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/SimpleConstraints.java
rename to MMTk/src/org/mmtk/plan/SimpleConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/SimpleMutator.java b/MMTk/src/org/mmtk/plan/SimpleMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/SimpleMutator.java
rename to MMTk/src/org/mmtk/plan/SimpleMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/SimplePhase.java b/MMTk/src/org/mmtk/plan/SimplePhase.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/SimplePhase.java
rename to MMTk/src/org/mmtk/plan/SimplePhase.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/StopTheWorld.java b/MMTk/src/org/mmtk/plan/StopTheWorld.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/StopTheWorld.java
rename to MMTk/src/org/mmtk/plan/StopTheWorld.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/StopTheWorldCollector.java b/MMTk/src/org/mmtk/plan/StopTheWorldCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/StopTheWorldCollector.java
rename to MMTk/src/org/mmtk/plan/StopTheWorldCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/StopTheWorldConstraints.java b/MMTk/src/org/mmtk/plan/StopTheWorldConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/StopTheWorldConstraints.java
rename to MMTk/src/org/mmtk/plan/StopTheWorldConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/StopTheWorldMutator.java b/MMTk/src/org/mmtk/plan/StopTheWorldMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/StopTheWorldMutator.java
rename to MMTk/src/org/mmtk/plan/StopTheWorldMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/Trace.java b/MMTk/src/org/mmtk/plan/Trace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/Trace.java
rename to MMTk/src/org/mmtk/plan/Trace.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/TraceLocal.java b/MMTk/src/org/mmtk/plan/TraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/TraceLocal.java
rename to MMTk/src/org/mmtk/plan/TraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java b/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/TraceWriteBuffer.java
rename to MMTk/src/org/mmtk/plan/TraceWriteBuffer.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/TransitiveClosure.java b/MMTk/src/org/mmtk/plan/TransitiveClosure.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/TransitiveClosure.java
rename to MMTk/src/org/mmtk/plan/TransitiveClosure.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/copyms/CopyMS.java b/MMTk/src/org/mmtk/plan/copyms/CopyMS.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/copyms/CopyMS.java
rename to MMTk/src/org/mmtk/plan/copyms/CopyMS.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSCollector.java b/MMTk/src/org/mmtk/plan/copyms/CopyMSCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSCollector.java
rename to MMTk/src/org/mmtk/plan/copyms/CopyMSCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSConstraints.java b/MMTk/src/org/mmtk/plan/copyms/CopyMSConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSConstraints.java
rename to MMTk/src/org/mmtk/plan/copyms/CopyMSConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSMutator.java b/MMTk/src/org/mmtk/plan/copyms/CopyMSMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSMutator.java
rename to MMTk/src/org/mmtk/plan/copyms/CopyMSMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSTraceLocal.java b/MMTk/src/org/mmtk/plan/copyms/CopyMSTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/copyms/CopyMSTraceLocal.java
rename to MMTk/src/org/mmtk/plan/copyms/CopyMSTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/Gen.java b/MMTk/src/org/mmtk/plan/generational/Gen.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/Gen.java
rename to MMTk/src/org/mmtk/plan/generational/Gen.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/GenCollector.java b/MMTk/src/org/mmtk/plan/generational/GenCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/GenCollector.java
rename to MMTk/src/org/mmtk/plan/generational/GenCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java b/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/GenConstraints.java
rename to MMTk/src/org/mmtk/plan/generational/GenConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/GenMatureTraceLocal.java b/MMTk/src/org/mmtk/plan/generational/GenMatureTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/GenMatureTraceLocal.java
rename to MMTk/src/org/mmtk/plan/generational/GenMatureTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java b/MMTk/src/org/mmtk/plan/generational/GenMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/GenMutator.java
rename to MMTk/src/org/mmtk/plan/generational/GenMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/GenNurseryTraceLocal.java b/MMTk/src/org/mmtk/plan/generational/GenNurseryTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/GenNurseryTraceLocal.java
rename to MMTk/src/org/mmtk/plan/generational/GenNurseryTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopy.java b/MMTk/src/org/mmtk/plan/generational/copying/GenCopy.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopy.java
rename to MMTk/src/org/mmtk/plan/generational/copying/GenCopy.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyCollector.java b/MMTk/src/org/mmtk/plan/generational/copying/GenCopyCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyCollector.java
rename to MMTk/src/org/mmtk/plan/generational/copying/GenCopyCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyConstraints.java b/MMTk/src/org/mmtk/plan/generational/copying/GenCopyConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyConstraints.java
rename to MMTk/src/org/mmtk/plan/generational/copying/GenCopyConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMatureTraceLocal.java b/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMatureTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMatureTraceLocal.java
rename to MMTk/src/org/mmtk/plan/generational/copying/GenCopyMatureTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMutator.java b/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/copying/GenCopyMutator.java
rename to MMTk/src/org/mmtk/plan/generational/copying/GenCopyMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmix.java b/MMTk/src/org/mmtk/plan/generational/immix/GenImmix.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmix.java
rename to MMTk/src/org/mmtk/plan/generational/immix/GenImmix.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixCollector.java b/MMTk/src/org/mmtk/plan/generational/immix/GenImmixCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixCollector.java
rename to MMTk/src/org/mmtk/plan/generational/immix/GenImmixCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixConstraints.java b/MMTk/src/org/mmtk/plan/generational/immix/GenImmixConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixConstraints.java
rename to MMTk/src/org/mmtk/plan/generational/immix/GenImmixConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureDefragTraceLocal.java b/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureDefragTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureDefragTraceLocal.java
rename to MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureDefragTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureTraceLocal.java b/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureTraceLocal.java
rename to MMTk/src/org/mmtk/plan/generational/immix/GenImmixMatureTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMutator.java b/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/immix/GenImmixMutator.java
rename to MMTk/src/org/mmtk/plan/generational/immix/GenImmixMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMS.java b/MMTk/src/org/mmtk/plan/generational/marksweep/GenMS.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMS.java
rename to MMTk/src/org/mmtk/plan/generational/marksweep/GenMS.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSCollector.java b/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSCollector.java
rename to MMTk/src/org/mmtk/plan/generational/marksweep/GenMSCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSConstraints.java b/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSConstraints.java
rename to MMTk/src/org/mmtk/plan/generational/marksweep/GenMSConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMatureTraceLocal.java b/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMatureTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMatureTraceLocal.java
rename to MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMatureTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMutator.java b/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMutator.java
rename to MMTk/src/org/mmtk/plan/generational/marksweep/GenMSMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/immix/Immix.java b/MMTk/src/org/mmtk/plan/immix/Immix.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/immix/Immix.java
rename to MMTk/src/org/mmtk/plan/immix/Immix.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/immix/ImmixCollector.java b/MMTk/src/org/mmtk/plan/immix/ImmixCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/immix/ImmixCollector.java
rename to MMTk/src/org/mmtk/plan/immix/ImmixCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/immix/ImmixConstraints.java b/MMTk/src/org/mmtk/plan/immix/ImmixConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/immix/ImmixConstraints.java
rename to MMTk/src/org/mmtk/plan/immix/ImmixConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/immix/ImmixDefragTraceLocal.java b/MMTk/src/org/mmtk/plan/immix/ImmixDefragTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/immix/ImmixDefragTraceLocal.java
rename to MMTk/src/org/mmtk/plan/immix/ImmixDefragTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/immix/ImmixMutator.java b/MMTk/src/org/mmtk/plan/immix/ImmixMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/immix/ImmixMutator.java
rename to MMTk/src/org/mmtk/plan/immix/ImmixMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/immix/ImmixTraceLocal.java b/MMTk/src/org/mmtk/plan/immix/ImmixTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/immix/ImmixTraceLocal.java
rename to MMTk/src/org/mmtk/plan/immix/ImmixTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/markcompact/MC.java b/MMTk/src/org/mmtk/plan/markcompact/MC.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/markcompact/MC.java
rename to MMTk/src/org/mmtk/plan/markcompact/MC.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/markcompact/MCCollector.java b/MMTk/src/org/mmtk/plan/markcompact/MCCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/markcompact/MCCollector.java
rename to MMTk/src/org/mmtk/plan/markcompact/MCCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/markcompact/MCConstraints.java b/MMTk/src/org/mmtk/plan/markcompact/MCConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/markcompact/MCConstraints.java
rename to MMTk/src/org/mmtk/plan/markcompact/MCConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/markcompact/MCForwardTraceLocal.java b/MMTk/src/org/mmtk/plan/markcompact/MCForwardTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/markcompact/MCForwardTraceLocal.java
rename to MMTk/src/org/mmtk/plan/markcompact/MCForwardTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/markcompact/MCMarkTraceLocal.java b/MMTk/src/org/mmtk/plan/markcompact/MCMarkTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/markcompact/MCMarkTraceLocal.java
rename to MMTk/src/org/mmtk/plan/markcompact/MCMarkTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/markcompact/MCMutator.java b/MMTk/src/org/mmtk/plan/markcompact/MCMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/markcompact/MCMutator.java
rename to MMTk/src/org/mmtk/plan/markcompact/MCMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/marksweep/MS.java b/MMTk/src/org/mmtk/plan/marksweep/MS.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/marksweep/MS.java
rename to MMTk/src/org/mmtk/plan/marksweep/MS.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/marksweep/MSCollector.java b/MMTk/src/org/mmtk/plan/marksweep/MSCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/marksweep/MSCollector.java
rename to MMTk/src/org/mmtk/plan/marksweep/MSCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/marksweep/MSConstraints.java b/MMTk/src/org/mmtk/plan/marksweep/MSConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/marksweep/MSConstraints.java
rename to MMTk/src/org/mmtk/plan/marksweep/MSConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/marksweep/MSMutator.java b/MMTk/src/org/mmtk/plan/marksweep/MSMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/marksweep/MSMutator.java
rename to MMTk/src/org/mmtk/plan/marksweep/MSMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/marksweep/MSTraceLocal.java b/MMTk/src/org/mmtk/plan/marksweep/MSTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/marksweep/MSTraceLocal.java
rename to MMTk/src/org/mmtk/plan/marksweep/MSTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/nogc/NoGC.java b/MMTk/src/org/mmtk/plan/nogc/NoGC.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/nogc/NoGC.java
rename to MMTk/src/org/mmtk/plan/nogc/NoGC.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/nogc/NoGCCollector.java b/MMTk/src/org/mmtk/plan/nogc/NoGCCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/nogc/NoGCCollector.java
rename to MMTk/src/org/mmtk/plan/nogc/NoGCCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/nogc/NoGCConstraints.java b/MMTk/src/org/mmtk/plan/nogc/NoGCConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/nogc/NoGCConstraints.java
rename to MMTk/src/org/mmtk/plan/nogc/NoGCConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/nogc/NoGCMutator.java b/MMTk/src/org/mmtk/plan/nogc/NoGCMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/nogc/NoGCMutator.java
rename to MMTk/src/org/mmtk/plan/nogc/NoGCMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/nogc/NoGCTraceLocal.java b/MMTk/src/org/mmtk/plan/nogc/NoGCTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/nogc/NoGCTraceLocal.java
rename to MMTk/src/org/mmtk/plan/nogc/NoGCTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/poisoned/Poisoned.java b/MMTk/src/org/mmtk/plan/poisoned/Poisoned.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/poisoned/Poisoned.java
rename to MMTk/src/org/mmtk/plan/poisoned/Poisoned.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedCollector.java b/MMTk/src/org/mmtk/plan/poisoned/PoisonedCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedCollector.java
rename to MMTk/src/org/mmtk/plan/poisoned/PoisonedCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java b/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java
rename to MMTk/src/org/mmtk/plan/poisoned/PoisonedConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java b/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
rename to MMTk/src/org/mmtk/plan/poisoned/PoisonedMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCBase.java b/MMTk/src/org/mmtk/plan/refcount/RCBase.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCBase.java
rename to MMTk/src/org/mmtk/plan/refcount/RCBase.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseCollector.java b/MMTk/src/org/mmtk/plan/refcount/RCBaseCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseCollector.java
rename to MMTk/src/org/mmtk/plan/refcount/RCBaseCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java b/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java
rename to MMTk/src/org/mmtk/plan/refcount/RCBaseConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java b/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java
rename to MMTk/src/org/mmtk/plan/refcount/RCBaseMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCDecBuffer.java b/MMTk/src/org/mmtk/plan/refcount/RCDecBuffer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCDecBuffer.java
rename to MMTk/src/org/mmtk/plan/refcount/RCDecBuffer.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCHeader.java b/MMTk/src/org/mmtk/plan/refcount/RCHeader.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCHeader.java
rename to MMTk/src/org/mmtk/plan/refcount/RCHeader.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/RCZero.java b/MMTk/src/org/mmtk/plan/refcount/RCZero.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/RCZero.java
rename to MMTk/src/org/mmtk/plan/refcount/RCZero.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarked.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarked.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarked.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarked.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarkedAndZero.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarkedAndZero.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarkedAndZero.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTDecMarkedAndZero.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTFreeLargeObjectSweeper.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTFreeLargeObjectSweeper.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTFreeLargeObjectSweeper.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTFreeLargeObjectSweeper.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTScanLargeObjectSweeper.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTScanLargeObjectSweeper.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTScanLargeObjectSweeper.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTScanLargeObjectSweeper.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweepImmortalScanner.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweepImmortalScanner.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweepImmortalScanner.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweepImmortalScanner.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweeper.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweeper.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweeper.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTSweeper.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTTraceLocal.java b/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/backuptrace/BTTraceLocal.java
rename to MMTk/src/org/mmtk/plan/refcount/backuptrace/BTTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RC.java b/MMTk/src/org/mmtk/plan/refcount/fullheap/RC.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RC.java
rename to MMTk/src/org/mmtk/plan/refcount/fullheap/RC.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCCollector.java b/MMTk/src/org/mmtk/plan/refcount/fullheap/RCCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCCollector.java
rename to MMTk/src/org/mmtk/plan/refcount/fullheap/RCCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCConstraints.java b/MMTk/src/org/mmtk/plan/refcount/fullheap/RCConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCConstraints.java
rename to MMTk/src/org/mmtk/plan/refcount/fullheap/RCConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCFindRootSetTraceLocal.java b/MMTk/src/org/mmtk/plan/refcount/fullheap/RCFindRootSetTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCFindRootSetTraceLocal.java
rename to MMTk/src/org/mmtk/plan/refcount/fullheap/RCFindRootSetTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCModifiedProcessor.java b/MMTk/src/org/mmtk/plan/refcount/fullheap/RCModifiedProcessor.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCModifiedProcessor.java
rename to MMTk/src/org/mmtk/plan/refcount/fullheap/RCModifiedProcessor.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java b/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java
rename to MMTk/src/org/mmtk/plan/refcount/fullheap/RCMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRC.java b/MMTk/src/org/mmtk/plan/refcount/generational/GenRC.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRC.java
rename to MMTk/src/org/mmtk/plan/refcount/generational/GenRC.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java b/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java
rename to MMTk/src/org/mmtk/plan/refcount/generational/GenRCCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCConstraints.java b/MMTk/src/org/mmtk/plan/refcount/generational/GenRCConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCConstraints.java
rename to MMTk/src/org/mmtk/plan/refcount/generational/GenRCConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCFindRootSetTraceLocal.java b/MMTk/src/org/mmtk/plan/refcount/generational/GenRCFindRootSetTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCFindRootSetTraceLocal.java
rename to MMTk/src/org/mmtk/plan/refcount/generational/GenRCFindRootSetTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCModifiedProcessor.java b/MMTk/src/org/mmtk/plan/refcount/generational/GenRCModifiedProcessor.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCModifiedProcessor.java
rename to MMTk/src/org/mmtk/plan/refcount/generational/GenRCModifiedProcessor.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java b/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java
rename to MMTk/src/org/mmtk/plan/refcount/generational/GenRCMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/SS.java b/MMTk/src/org/mmtk/plan/semispace/SS.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/SS.java
rename to MMTk/src/org/mmtk/plan/semispace/SS.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/SSCollector.java b/MMTk/src/org/mmtk/plan/semispace/SSCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/SSCollector.java
rename to MMTk/src/org/mmtk/plan/semispace/SSCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/SSConstraints.java b/MMTk/src/org/mmtk/plan/semispace/SSConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/SSConstraints.java
rename to MMTk/src/org/mmtk/plan/semispace/SSConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/SSMutator.java b/MMTk/src/org/mmtk/plan/semispace/SSMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/SSMutator.java
rename to MMTk/src/org/mmtk/plan/semispace/SSMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/SSTraceLocal.java b/MMTk/src/org/mmtk/plan/semispace/SSTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/SSTraceLocal.java
rename to MMTk/src/org/mmtk/plan/semispace/SSTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspy.java b/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspy.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspy.java
rename to MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspy.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyCollector.java b/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyCollector.java
rename to MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyConstraints.java b/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyConstraints.java
rename to MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyMutator.java b/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyMutator.java
rename to MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyTraceLocal.java b/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyTraceLocal.java
rename to MMTk/src/org/mmtk/plan/semispace/gcspy/SSGCspyTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java b/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java
rename to MMTk/src/org/mmtk/plan/semispace/gctrace/GCTrace.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java b/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java
rename to MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java b/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java
rename to MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java b/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java
rename to MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceTraceLocal.java b/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceTraceLocal.java
rename to MMTk/src/org/mmtk/plan/semispace/gctrace/GCTraceTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmix.java b/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmix.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmix.java
rename to MMTk/src/org/mmtk/plan/stickyimmix/StickyImmix.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixCollector.java b/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixCollector.java
rename to MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java b/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java
rename to MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java b/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java
rename to MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixNurseryTraceLocal.java b/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixNurseryTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixNurseryTraceLocal.java
rename to MMTk/src/org/mmtk/plan/stickyimmix/StickyImmixNurseryTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMS.java b/MMTk/src/org/mmtk/plan/stickyms/StickyMS.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMS.java
rename to MMTk/src/org/mmtk/plan/stickyms/StickyMS.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSCollector.java b/MMTk/src/org/mmtk/plan/stickyms/StickyMSCollector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSCollector.java
rename to MMTk/src/org/mmtk/plan/stickyms/StickyMSCollector.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java b/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java
rename to MMTk/src/org/mmtk/plan/stickyms/StickyMSConstraints.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java b/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java
rename to MMTk/src/org/mmtk/plan/stickyms/StickyMSMutator.java
diff --git a/trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSNurseryTraceLocal.java b/MMTk/src/org/mmtk/plan/stickyms/StickyMSNurseryTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/plan/stickyms/StickyMSNurseryTraceLocal.java
rename to MMTk/src/org/mmtk/plan/stickyms/StickyMSNurseryTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/BaseLargeObjectSpace.java b/MMTk/src/org/mmtk/policy/BaseLargeObjectSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/BaseLargeObjectSpace.java
rename to MMTk/src/org/mmtk/policy/BaseLargeObjectSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/CopyLocal.java b/MMTk/src/org/mmtk/policy/CopyLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/CopyLocal.java
rename to MMTk/src/org/mmtk/policy/CopyLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/CopySpace.java b/MMTk/src/org/mmtk/policy/CopySpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/CopySpace.java
rename to MMTk/src/org/mmtk/policy/CopySpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/ExplicitFreeListLocal.java b/MMTk/src/org/mmtk/policy/ExplicitFreeListLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/ExplicitFreeListLocal.java
rename to MMTk/src/org/mmtk/policy/ExplicitFreeListLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/ExplicitFreeListSpace.java b/MMTk/src/org/mmtk/policy/ExplicitFreeListSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/ExplicitFreeListSpace.java
rename to MMTk/src/org/mmtk/policy/ExplicitFreeListSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/ExplicitLargeObjectSpace.java b/MMTk/src/org/mmtk/policy/ExplicitLargeObjectSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/ExplicitLargeObjectSpace.java
rename to MMTk/src/org/mmtk/policy/ExplicitLargeObjectSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/ImmortalLocal.java b/MMTk/src/org/mmtk/policy/ImmortalLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/ImmortalLocal.java
rename to MMTk/src/org/mmtk/policy/ImmortalLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/ImmortalSpace.java b/MMTk/src/org/mmtk/policy/ImmortalSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/ImmortalSpace.java
rename to MMTk/src/org/mmtk/policy/ImmortalSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/LargeObjectLocal.java b/MMTk/src/org/mmtk/policy/LargeObjectLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/LargeObjectLocal.java
rename to MMTk/src/org/mmtk/policy/LargeObjectLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/LargeObjectSpace.java b/MMTk/src/org/mmtk/policy/LargeObjectSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/LargeObjectSpace.java
rename to MMTk/src/org/mmtk/policy/LargeObjectSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/MarkCompactLocal.java b/MMTk/src/org/mmtk/policy/MarkCompactLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/MarkCompactLocal.java
rename to MMTk/src/org/mmtk/policy/MarkCompactLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/MarkCompactSpace.java b/MMTk/src/org/mmtk/policy/MarkCompactSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/MarkCompactSpace.java
rename to MMTk/src/org/mmtk/policy/MarkCompactSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/MarkSweepLocal.java b/MMTk/src/org/mmtk/policy/MarkSweepLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/MarkSweepLocal.java
rename to MMTk/src/org/mmtk/policy/MarkSweepLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/MarkSweepSpace.java b/MMTk/src/org/mmtk/policy/MarkSweepSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/MarkSweepSpace.java
rename to MMTk/src/org/mmtk/policy/MarkSweepSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/RawPageSpace.java b/MMTk/src/org/mmtk/policy/RawPageSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/RawPageSpace.java
rename to MMTk/src/org/mmtk/policy/RawPageSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/SegregatedFreeListSpace.java b/MMTk/src/org/mmtk/policy/SegregatedFreeListSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/SegregatedFreeListSpace.java
rename to MMTk/src/org/mmtk/policy/SegregatedFreeListSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/Space.java b/MMTk/src/org/mmtk/policy/Space.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/Space.java
rename to MMTk/src/org/mmtk/policy/Space.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/Block.java b/MMTk/src/org/mmtk/policy/immix/Block.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/Block.java
rename to MMTk/src/org/mmtk/policy/immix/Block.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/Chunk.java b/MMTk/src/org/mmtk/policy/immix/Chunk.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/Chunk.java
rename to MMTk/src/org/mmtk/policy/immix/Chunk.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/ChunkList.java b/MMTk/src/org/mmtk/policy/immix/ChunkList.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/ChunkList.java
rename to MMTk/src/org/mmtk/policy/immix/ChunkList.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/CollectorLocal.java b/MMTk/src/org/mmtk/policy/immix/CollectorLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/CollectorLocal.java
rename to MMTk/src/org/mmtk/policy/immix/CollectorLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/Defrag.java b/MMTk/src/org/mmtk/policy/immix/Defrag.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/Defrag.java
rename to MMTk/src/org/mmtk/policy/immix/Defrag.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/ImmixConstants.java b/MMTk/src/org/mmtk/policy/immix/ImmixConstants.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/ImmixConstants.java
rename to MMTk/src/org/mmtk/policy/immix/ImmixConstants.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/ImmixSpace.java b/MMTk/src/org/mmtk/policy/immix/ImmixSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/ImmixSpace.java
rename to MMTk/src/org/mmtk/policy/immix/ImmixSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/Line.java b/MMTk/src/org/mmtk/policy/immix/Line.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/Line.java
rename to MMTk/src/org/mmtk/policy/immix/Line.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/MutatorLocal.java b/MMTk/src/org/mmtk/policy/immix/MutatorLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/MutatorLocal.java
rename to MMTk/src/org/mmtk/policy/immix/MutatorLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/policy/immix/ObjectHeader.java b/MMTk/src/org/mmtk/policy/immix/ObjectHeader.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/policy/immix/ObjectHeader.java
rename to MMTk/src/org/mmtk/policy/immix/ObjectHeader.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/BaseGenericFreeList.java b/MMTk/src/org/mmtk/utility/BaseGenericFreeList.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/BaseGenericFreeList.java
rename to MMTk/src/org/mmtk/utility/BaseGenericFreeList.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/CallSite.java b/MMTk/src/org/mmtk/utility/CallSite.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/CallSite.java
rename to MMTk/src/org/mmtk/utility/CallSite.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/Constants.java b/MMTk/src/org/mmtk/utility/Constants.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/Constants.java
rename to MMTk/src/org/mmtk/utility/Constants.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/Conversions.java b/MMTk/src/org/mmtk/utility/Conversions.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/Conversions.java
rename to MMTk/src/org/mmtk/utility/Conversions.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/CycleDetector.java b/MMTk/src/org/mmtk/utility/CycleDetector.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/CycleDetector.java
rename to MMTk/src/org/mmtk/utility/CycleDetector.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/DoublyLinkedList.java b/MMTk/src/org/mmtk/utility/DoublyLinkedList.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/DoublyLinkedList.java
rename to MMTk/src/org/mmtk/utility/DoublyLinkedList.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/GenericFreeList.java b/MMTk/src/org/mmtk/utility/GenericFreeList.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/GenericFreeList.java
rename to MMTk/src/org/mmtk/utility/GenericFreeList.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/Log.java b/MMTk/src/org/mmtk/utility/Log.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/Log.java
rename to MMTk/src/org/mmtk/utility/Log.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/Memory.java b/MMTk/src/org/mmtk/utility/Memory.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/Memory.java
rename to MMTk/src/org/mmtk/utility/Memory.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/SimpleHashtable.java b/MMTk/src/org/mmtk/utility/SimpleHashtable.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/SimpleHashtable.java
rename to MMTk/src/org/mmtk/utility/SimpleHashtable.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/Synchronize.java b/MMTk/src/org/mmtk/utility/Synchronize.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/Synchronize.java
rename to MMTk/src/org/mmtk/utility/Synchronize.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/TraceGenerator.java b/MMTk/src/org/mmtk/utility/TraceGenerator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/TraceGenerator.java
rename to MMTk/src/org/mmtk/utility/TraceGenerator.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/TracingConstants.java b/MMTk/src/org/mmtk/utility/TracingConstants.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/TracingConstants.java
rename to MMTk/src/org/mmtk/utility/TracingConstants.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/Treadmill.java b/MMTk/src/org/mmtk/utility/Treadmill.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/Treadmill.java
rename to MMTk/src/org/mmtk/utility/Treadmill.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/Allocator.java b/MMTk/src/org/mmtk/utility/alloc/Allocator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/Allocator.java
rename to MMTk/src/org/mmtk/utility/alloc/Allocator.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/BlockAllocator.java b/MMTk/src/org/mmtk/utility/alloc/BlockAllocator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/BlockAllocator.java
rename to MMTk/src/org/mmtk/utility/alloc/BlockAllocator.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/BumpPointer.java b/MMTk/src/org/mmtk/utility/alloc/BumpPointer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/BumpPointer.java
rename to MMTk/src/org/mmtk/utility/alloc/BumpPointer.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/DumpLinearScan.java b/MMTk/src/org/mmtk/utility/alloc/DumpLinearScan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/DumpLinearScan.java
rename to MMTk/src/org/mmtk/utility/alloc/DumpLinearScan.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/EmbeddedMetaData.java b/MMTk/src/org/mmtk/utility/alloc/EmbeddedMetaData.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/EmbeddedMetaData.java
rename to MMTk/src/org/mmtk/utility/alloc/EmbeddedMetaData.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/ImmixAllocator.java b/MMTk/src/org/mmtk/utility/alloc/ImmixAllocator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/ImmixAllocator.java
rename to MMTk/src/org/mmtk/utility/alloc/ImmixAllocator.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/LargeObjectAllocator.java b/MMTk/src/org/mmtk/utility/alloc/LargeObjectAllocator.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/LargeObjectAllocator.java
rename to MMTk/src/org/mmtk/utility/alloc/LargeObjectAllocator.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/LinearScan.java b/MMTk/src/org/mmtk/utility/alloc/LinearScan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/LinearScan.java
rename to MMTk/src/org/mmtk/utility/alloc/LinearScan.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeList.java b/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeList.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeList.java
rename to MMTk/src/org/mmtk/utility/alloc/SegregatedFreeList.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeListLocal.java b/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeListLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/alloc/SegregatedFreeListLocal.java
rename to MMTk/src/org/mmtk/utility/alloc/SegregatedFreeListLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/AddressDeque.java b/MMTk/src/org/mmtk/utility/deque/AddressDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/AddressDeque.java
rename to MMTk/src/org/mmtk/utility/deque/AddressDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/AddressPairDeque.java b/MMTk/src/org/mmtk/utility/deque/AddressPairDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/AddressPairDeque.java
rename to MMTk/src/org/mmtk/utility/deque/AddressPairDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/AddressTripleDeque.java b/MMTk/src/org/mmtk/utility/deque/AddressTripleDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/AddressTripleDeque.java
rename to MMTk/src/org/mmtk/utility/deque/AddressTripleDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/Deque.java b/MMTk/src/org/mmtk/utility/deque/Deque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/Deque.java
rename to MMTk/src/org/mmtk/utility/deque/Deque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/LocalDeque.java b/MMTk/src/org/mmtk/utility/deque/LocalDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/LocalDeque.java
rename to MMTk/src/org/mmtk/utility/deque/LocalDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/LocalQueue.java b/MMTk/src/org/mmtk/utility/deque/LocalQueue.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/LocalQueue.java
rename to MMTk/src/org/mmtk/utility/deque/LocalQueue.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/LocalSSB.java b/MMTk/src/org/mmtk/utility/deque/LocalSSB.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/LocalSSB.java
rename to MMTk/src/org/mmtk/utility/deque/LocalSSB.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java b/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java
rename to MMTk/src/org/mmtk/utility/deque/ObjectReferenceBuffer.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceDeque.java b/MMTk/src/org/mmtk/utility/deque/ObjectReferenceDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/ObjectReferenceDeque.java
rename to MMTk/src/org/mmtk/utility/deque/ObjectReferenceDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/SharedDeque.java b/MMTk/src/org/mmtk/utility/deque/SharedDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/SharedDeque.java
rename to MMTk/src/org/mmtk/utility/deque/SharedDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/SortSharedDeque.java b/MMTk/src/org/mmtk/utility/deque/SortSharedDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/SortSharedDeque.java
rename to MMTk/src/org/mmtk/utility/deque/SortSharedDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/SortTODAddressStack.java b/MMTk/src/org/mmtk/utility/deque/SortTODAddressStack.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/SortTODAddressStack.java
rename to MMTk/src/org/mmtk/utility/deque/SortTODAddressStack.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/SortTODObjectReferenceStack.java b/MMTk/src/org/mmtk/utility/deque/SortTODObjectReferenceStack.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/SortTODObjectReferenceStack.java
rename to MMTk/src/org/mmtk/utility/deque/SortTODObjectReferenceStack.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/SortTODSharedDeque.java b/MMTk/src/org/mmtk/utility/deque/SortTODSharedDeque.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/SortTODSharedDeque.java
rename to MMTk/src/org/mmtk/utility/deque/SortTODSharedDeque.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java b/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/TraceBuffer.java
rename to MMTk/src/org/mmtk/utility/deque/TraceBuffer.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/deque/WriteBuffer.java b/MMTk/src/org/mmtk/utility/deque/WriteBuffer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/deque/WriteBuffer.java
rename to MMTk/src/org/mmtk/utility/deque/WriteBuffer.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/Color.java b/MMTk/src/org/mmtk/utility/gcspy/Color.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/Color.java
rename to MMTk/src/org/mmtk/utility/gcspy/Color.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/GCspy.java b/MMTk/src/org/mmtk/utility/gcspy/GCspy.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/GCspy.java
rename to MMTk/src/org/mmtk/utility/gcspy/GCspy.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/LinearScan.java b/MMTk/src/org/mmtk/utility/gcspy/LinearScan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/LinearScan.java
rename to MMTk/src/org/mmtk/utility/gcspy/LinearScan.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/StreamConstants.java b/MMTk/src/org/mmtk/utility/gcspy/StreamConstants.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/StreamConstants.java
rename to MMTk/src/org/mmtk/utility/gcspy/StreamConstants.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/Subspace.java b/MMTk/src/org/mmtk/utility/gcspy/Subspace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/Subspace.java
rename to MMTk/src/org/mmtk/utility/gcspy/Subspace.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/AbstractDriver.java b/MMTk/src/org/mmtk/utility/gcspy/drivers/AbstractDriver.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/AbstractDriver.java
rename to MMTk/src/org/mmtk/utility/gcspy/drivers/AbstractDriver.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/GenImmortalSpaceDriver.java b/MMTk/src/org/mmtk/utility/gcspy/drivers/GenImmortalSpaceDriver.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/GenImmortalSpaceDriver.java
rename to MMTk/src/org/mmtk/utility/gcspy/drivers/GenImmortalSpaceDriver.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/GenLOSDriver.java b/MMTk/src/org/mmtk/utility/gcspy/drivers/GenLOSDriver.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/GenLOSDriver.java
rename to MMTk/src/org/mmtk/utility/gcspy/drivers/GenLOSDriver.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/ImmortalSpaceDriver.java b/MMTk/src/org/mmtk/utility/gcspy/drivers/ImmortalSpaceDriver.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/ImmortalSpaceDriver.java
rename to MMTk/src/org/mmtk/utility/gcspy/drivers/ImmortalSpaceDriver.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/LinearSpaceDriver.java b/MMTk/src/org/mmtk/utility/gcspy/drivers/LinearSpaceDriver.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/LinearSpaceDriver.java
rename to MMTk/src/org/mmtk/utility/gcspy/drivers/LinearSpaceDriver.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/TreadmillDriver.java b/MMTk/src/org/mmtk/utility/gcspy/drivers/TreadmillDriver.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/gcspy/drivers/TreadmillDriver.java
rename to MMTk/src/org/mmtk/utility/gcspy/drivers/TreadmillDriver.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java b/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java
rename to MMTk/src/org/mmtk/utility/heap/FreeListPageResource.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/HeapGrowthManager.java b/MMTk/src/org/mmtk/utility/heap/HeapGrowthManager.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/HeapGrowthManager.java
rename to MMTk/src/org/mmtk/utility/heap/HeapGrowthManager.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/Map.java b/MMTk/src/org/mmtk/utility/heap/Map.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/Map.java
rename to MMTk/src/org/mmtk/utility/heap/Map.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/Mmapper.java b/MMTk/src/org/mmtk/utility/heap/Mmapper.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/Mmapper.java
rename to MMTk/src/org/mmtk/utility/heap/Mmapper.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/MonotonePageResource.java b/MMTk/src/org/mmtk/utility/heap/MonotonePageResource.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/MonotonePageResource.java
rename to MMTk/src/org/mmtk/utility/heap/MonotonePageResource.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/PageResource.java b/MMTk/src/org/mmtk/utility/heap/PageResource.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/PageResource.java
rename to MMTk/src/org/mmtk/utility/heap/PageResource.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/SpaceDescriptor.java b/MMTk/src/org/mmtk/utility/heap/SpaceDescriptor.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/SpaceDescriptor.java
rename to MMTk/src/org/mmtk/utility/heap/SpaceDescriptor.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/heap/VMRequest.java b/MMTk/src/org/mmtk/utility/heap/VMRequest.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/heap/VMRequest.java
rename to MMTk/src/org/mmtk/utility/heap/VMRequest.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/BoundedNursery.java b/MMTk/src/org/mmtk/utility/options/BoundedNursery.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/BoundedNursery.java
rename to MMTk/src/org/mmtk/utility/options/BoundedNursery.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/ConcurrentTrigger.java b/MMTk/src/org/mmtk/utility/options/ConcurrentTrigger.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/ConcurrentTrigger.java
rename to MMTk/src/org/mmtk/utility/options/ConcurrentTrigger.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/CycleFilterThreshold.java b/MMTk/src/org/mmtk/utility/options/CycleFilterThreshold.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/CycleFilterThreshold.java
rename to MMTk/src/org/mmtk/utility/options/CycleFilterThreshold.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/CycleMetaDataLimit.java b/MMTk/src/org/mmtk/utility/options/CycleMetaDataLimit.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/CycleMetaDataLimit.java
rename to MMTk/src/org/mmtk/utility/options/CycleMetaDataLimit.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/CycleTriggerThreshold.java b/MMTk/src/org/mmtk/utility/options/CycleTriggerThreshold.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/CycleTriggerThreshold.java
rename to MMTk/src/org/mmtk/utility/options/CycleTriggerThreshold.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DebugAddress.java b/MMTk/src/org/mmtk/utility/options/DebugAddress.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DebugAddress.java
rename to MMTk/src/org/mmtk/utility/options/DebugAddress.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroom.java b/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroom.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroom.java
rename to MMTk/src/org/mmtk/utility/options/DefragFreeHeadroom.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroomFraction.java b/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroomFraction.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DefragFreeHeadroomFraction.java
rename to MMTk/src/org/mmtk/utility/options/DefragFreeHeadroomFraction.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DefragHeadroom.java b/MMTk/src/org/mmtk/utility/options/DefragHeadroom.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DefragHeadroom.java
rename to MMTk/src/org/mmtk/utility/options/DefragHeadroom.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DefragHeadroomFraction.java b/MMTk/src/org/mmtk/utility/options/DefragHeadroomFraction.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DefragHeadroomFraction.java
rename to MMTk/src/org/mmtk/utility/options/DefragHeadroomFraction.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DefragLineReuseRatio.java b/MMTk/src/org/mmtk/utility/options/DefragLineReuseRatio.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DefragLineReuseRatio.java
rename to MMTk/src/org/mmtk/utility/options/DefragLineReuseRatio.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DefragSimpleSpillThreshold.java b/MMTk/src/org/mmtk/utility/options/DefragSimpleSpillThreshold.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DefragSimpleSpillThreshold.java
rename to MMTk/src/org/mmtk/utility/options/DefragSimpleSpillThreshold.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/DummyEnum.java b/MMTk/src/org/mmtk/utility/options/DummyEnum.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/DummyEnum.java
rename to MMTk/src/org/mmtk/utility/options/DummyEnum.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/EagerCompleteSweep.java b/MMTk/src/org/mmtk/utility/options/EagerCompleteSweep.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/EagerCompleteSweep.java
rename to MMTk/src/org/mmtk/utility/options/EagerCompleteSweep.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/EagerMmapSpaces.java b/MMTk/src/org/mmtk/utility/options/EagerMmapSpaces.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/EagerMmapSpaces.java
rename to MMTk/src/org/mmtk/utility/options/EagerMmapSpaces.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/EchoOptions.java b/MMTk/src/org/mmtk/utility/options/EchoOptions.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/EchoOptions.java
rename to MMTk/src/org/mmtk/utility/options/EchoOptions.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/FixedNursery.java b/MMTk/src/org/mmtk/utility/options/FixedNursery.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/FixedNursery.java
rename to MMTk/src/org/mmtk/utility/options/FixedNursery.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/FragmentationStats.java b/MMTk/src/org/mmtk/utility/options/FragmentationStats.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/FragmentationStats.java
rename to MMTk/src/org/mmtk/utility/options/FragmentationStats.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/FullHeapSystemGC.java b/MMTk/src/org/mmtk/utility/options/FullHeapSystemGC.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/FullHeapSystemGC.java
rename to MMTk/src/org/mmtk/utility/options/FullHeapSystemGC.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/GCTimeCap.java b/MMTk/src/org/mmtk/utility/options/GCTimeCap.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/GCTimeCap.java
rename to MMTk/src/org/mmtk/utility/options/GCTimeCap.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/GCspyPort.java b/MMTk/src/org/mmtk/utility/options/GCspyPort.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/GCspyPort.java
rename to MMTk/src/org/mmtk/utility/options/GCspyPort.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/GCspyTileSize.java b/MMTk/src/org/mmtk/utility/options/GCspyTileSize.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/GCspyTileSize.java
rename to MMTk/src/org/mmtk/utility/options/GCspyTileSize.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/GCspyWait.java b/MMTk/src/org/mmtk/utility/options/GCspyWait.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/GCspyWait.java
rename to MMTk/src/org/mmtk/utility/options/GCspyWait.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/GenCycleDetection.java b/MMTk/src/org/mmtk/utility/options/GenCycleDetection.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/GenCycleDetection.java
rename to MMTk/src/org/mmtk/utility/options/GenCycleDetection.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/HarnessAll.java b/MMTk/src/org/mmtk/utility/options/HarnessAll.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/HarnessAll.java
rename to MMTk/src/org/mmtk/utility/options/HarnessAll.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/IgnoreSystemGC.java b/MMTk/src/org/mmtk/utility/options/IgnoreSystemGC.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/IgnoreSystemGC.java
rename to MMTk/src/org/mmtk/utility/options/IgnoreSystemGC.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/LineReuseRatio.java b/MMTk/src/org/mmtk/utility/options/LineReuseRatio.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/LineReuseRatio.java
rename to MMTk/src/org/mmtk/utility/options/LineReuseRatio.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/MarkSweepMarkBits.java b/MMTk/src/org/mmtk/utility/options/MarkSweepMarkBits.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/MarkSweepMarkBits.java
rename to MMTk/src/org/mmtk/utility/options/MarkSweepMarkBits.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/MetaDataLimit.java b/MMTk/src/org/mmtk/utility/options/MetaDataLimit.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/MetaDataLimit.java
rename to MMTk/src/org/mmtk/utility/options/MetaDataLimit.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/NoFinalizer.java b/MMTk/src/org/mmtk/utility/options/NoFinalizer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/NoFinalizer.java
rename to MMTk/src/org/mmtk/utility/options/NoFinalizer.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/NoReferenceTypes.java b/MMTk/src/org/mmtk/utility/options/NoReferenceTypes.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/NoReferenceTypes.java
rename to MMTk/src/org/mmtk/utility/options/NoReferenceTypes.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/NurserySize.java b/MMTk/src/org/mmtk/utility/options/NurserySize.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/NurserySize.java
rename to MMTk/src/org/mmtk/utility/options/NurserySize.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/Options.java b/MMTk/src/org/mmtk/utility/options/Options.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/Options.java
rename to MMTk/src/org/mmtk/utility/options/Options.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/PerfMetric.java b/MMTk/src/org/mmtk/utility/options/PerfMetric.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/PerfMetric.java
rename to MMTk/src/org/mmtk/utility/options/PerfMetric.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/PrintPhaseStats.java b/MMTk/src/org/mmtk/utility/options/PrintPhaseStats.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/PrintPhaseStats.java
rename to MMTk/src/org/mmtk/utility/options/PrintPhaseStats.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/ProtectOnRelease.java b/MMTk/src/org/mmtk/utility/options/ProtectOnRelease.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/ProtectOnRelease.java
rename to MMTk/src/org/mmtk/utility/options/ProtectOnRelease.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/SanityCheck.java b/MMTk/src/org/mmtk/utility/options/SanityCheck.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/SanityCheck.java
rename to MMTk/src/org/mmtk/utility/options/SanityCheck.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/StressFactor.java b/MMTk/src/org/mmtk/utility/options/StressFactor.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/StressFactor.java
rename to MMTk/src/org/mmtk/utility/options/StressFactor.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/TraceRate.java b/MMTk/src/org/mmtk/utility/options/TraceRate.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/TraceRate.java
rename to MMTk/src/org/mmtk/utility/options/TraceRate.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/VariableSizeHeap.java b/MMTk/src/org/mmtk/utility/options/VariableSizeHeap.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/VariableSizeHeap.java
rename to MMTk/src/org/mmtk/utility/options/VariableSizeHeap.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/Verbose.java b/MMTk/src/org/mmtk/utility/options/Verbose.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/Verbose.java
rename to MMTk/src/org/mmtk/utility/options/Verbose.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/VerboseFragmentationStats.java b/MMTk/src/org/mmtk/utility/options/VerboseFragmentationStats.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/VerboseFragmentationStats.java
rename to MMTk/src/org/mmtk/utility/options/VerboseFragmentationStats.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/VerboseTiming.java b/MMTk/src/org/mmtk/utility/options/VerboseTiming.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/VerboseTiming.java
rename to MMTk/src/org/mmtk/utility/options/VerboseTiming.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/options/XmlStats.java b/MMTk/src/org/mmtk/utility/options/XmlStats.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/options/XmlStats.java
rename to MMTk/src/org/mmtk/utility/options/XmlStats.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityChecker.java b/MMTk/src/org/mmtk/utility/sanitychecker/SanityChecker.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityChecker.java
rename to MMTk/src/org/mmtk/utility/sanitychecker/SanityChecker.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityCheckerLocal.java b/MMTk/src/org/mmtk/utility/sanitychecker/SanityCheckerLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityCheckerLocal.java
rename to MMTk/src/org/mmtk/utility/sanitychecker/SanityCheckerLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityDataTable.java b/MMTk/src/org/mmtk/utility/sanitychecker/SanityDataTable.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityDataTable.java
rename to MMTk/src/org/mmtk/utility/sanitychecker/SanityDataTable.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityLinearScan.java b/MMTk/src/org/mmtk/utility/sanitychecker/SanityLinearScan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityLinearScan.java
rename to MMTk/src/org/mmtk/utility/sanitychecker/SanityLinearScan.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityRootTraceLocal.java b/MMTk/src/org/mmtk/utility/sanitychecker/SanityRootTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityRootTraceLocal.java
rename to MMTk/src/org/mmtk/utility/sanitychecker/SanityRootTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java b/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java
rename to MMTk/src/org/mmtk/utility/sanitychecker/SanityTraceLocal.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/BooleanCounter.java b/MMTk/src/org/mmtk/utility/statistics/BooleanCounter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/BooleanCounter.java
rename to MMTk/src/org/mmtk/utility/statistics/BooleanCounter.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/Counter.java b/MMTk/src/org/mmtk/utility/statistics/Counter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/Counter.java
rename to MMTk/src/org/mmtk/utility/statistics/Counter.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/EventCounter.java b/MMTk/src/org/mmtk/utility/statistics/EventCounter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/EventCounter.java
rename to MMTk/src/org/mmtk/utility/statistics/EventCounter.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/LongCounter.java b/MMTk/src/org/mmtk/utility/statistics/LongCounter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/LongCounter.java
rename to MMTk/src/org/mmtk/utility/statistics/LongCounter.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/PerfCounter.java b/MMTk/src/org/mmtk/utility/statistics/PerfCounter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/PerfCounter.java
rename to MMTk/src/org/mmtk/utility/statistics/PerfCounter.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/SizeCounter.java b/MMTk/src/org/mmtk/utility/statistics/SizeCounter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/SizeCounter.java
rename to MMTk/src/org/mmtk/utility/statistics/SizeCounter.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/Stats.java b/MMTk/src/org/mmtk/utility/statistics/Stats.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/Stats.java
rename to MMTk/src/org/mmtk/utility/statistics/Stats.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/Timer.java b/MMTk/src/org/mmtk/utility/statistics/Timer.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/Timer.java
rename to MMTk/src/org/mmtk/utility/statistics/Timer.java
diff --git a/trunk/MMTk/src/org/mmtk/utility/statistics/Xml.java b/MMTk/src/org/mmtk/utility/statistics/Xml.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/utility/statistics/Xml.java
rename to MMTk/src/org/mmtk/utility/statistics/Xml.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/ActivePlan.java b/MMTk/src/org/mmtk/vm/ActivePlan.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/ActivePlan.java
rename to MMTk/src/org/mmtk/vm/ActivePlan.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Assert.java b/MMTk/src/org/mmtk/vm/Assert.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Assert.java
rename to MMTk/src/org/mmtk/vm/Assert.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Barriers.java b/MMTk/src/org/mmtk/vm/Barriers.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Barriers.java
rename to MMTk/src/org/mmtk/vm/Barriers.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/BuildTimeConfig.java b/MMTk/src/org/mmtk/vm/BuildTimeConfig.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/BuildTimeConfig.java
rename to MMTk/src/org/mmtk/vm/BuildTimeConfig.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Collection.java b/MMTk/src/org/mmtk/vm/Collection.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Collection.java
rename to MMTk/src/org/mmtk/vm/Collection.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Config.java b/MMTk/src/org/mmtk/vm/Config.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Config.java
rename to MMTk/src/org/mmtk/vm/Config.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Factory.java b/MMTk/src/org/mmtk/vm/Factory.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Factory.java
rename to MMTk/src/org/mmtk/vm/Factory.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/FinalizableProcessor.java b/MMTk/src/org/mmtk/vm/FinalizableProcessor.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/FinalizableProcessor.java
rename to MMTk/src/org/mmtk/vm/FinalizableProcessor.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Lock.java b/MMTk/src/org/mmtk/vm/Lock.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Lock.java
rename to MMTk/src/org/mmtk/vm/Lock.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/MMTk_Events.java b/MMTk/src/org/mmtk/vm/MMTk_Events.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/MMTk_Events.java
rename to MMTk/src/org/mmtk/vm/MMTk_Events.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Memory.java b/MMTk/src/org/mmtk/vm/Memory.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Memory.java
rename to MMTk/src/org/mmtk/vm/Memory.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/ObjectModel.java b/MMTk/src/org/mmtk/vm/ObjectModel.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/ObjectModel.java
rename to MMTk/src/org/mmtk/vm/ObjectModel.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/ReferenceProcessor.java b/MMTk/src/org/mmtk/vm/ReferenceProcessor.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/ReferenceProcessor.java
rename to MMTk/src/org/mmtk/vm/ReferenceProcessor.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Scanning.java b/MMTk/src/org/mmtk/vm/Scanning.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Scanning.java
rename to MMTk/src/org/mmtk/vm/Scanning.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Statistics.java b/MMTk/src/org/mmtk/vm/Statistics.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Statistics.java
rename to MMTk/src/org/mmtk/vm/Statistics.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/Strings.java b/MMTk/src/org/mmtk/vm/Strings.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/Strings.java
rename to MMTk/src/org/mmtk/vm/Strings.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/SynchronizedCounter.java b/MMTk/src/org/mmtk/vm/SynchronizedCounter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/SynchronizedCounter.java
rename to MMTk/src/org/mmtk/vm/SynchronizedCounter.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/TraceInterface.java b/MMTk/src/org/mmtk/vm/TraceInterface.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/TraceInterface.java
rename to MMTk/src/org/mmtk/vm/TraceInterface.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/VM.java b/MMTk/src/org/mmtk/vm/VM.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/VM.java
rename to MMTk/src/org/mmtk/vm/VM.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/ByteStream.java b/MMTk/src/org/mmtk/vm/gcspy/ByteStream.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/ByteStream.java
rename to MMTk/src/org/mmtk/vm/gcspy/ByteStream.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/IntStream.java b/MMTk/src/org/mmtk/vm/gcspy/IntStream.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/IntStream.java
rename to MMTk/src/org/mmtk/vm/gcspy/IntStream.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/ServerInterpreter.java b/MMTk/src/org/mmtk/vm/gcspy/ServerInterpreter.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/ServerInterpreter.java
rename to MMTk/src/org/mmtk/vm/gcspy/ServerInterpreter.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/ServerSpace.java b/MMTk/src/org/mmtk/vm/gcspy/ServerSpace.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/ServerSpace.java
rename to MMTk/src/org/mmtk/vm/gcspy/ServerSpace.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/ShortStream.java b/MMTk/src/org/mmtk/vm/gcspy/ShortStream.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/ShortStream.java
rename to MMTk/src/org/mmtk/vm/gcspy/ShortStream.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/Stream.java b/MMTk/src/org/mmtk/vm/gcspy/Stream.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/Stream.java
rename to MMTk/src/org/mmtk/vm/gcspy/Stream.java
diff --git a/trunk/MMTk/src/org/mmtk/vm/gcspy/Util.java b/MMTk/src/org/mmtk/vm/gcspy/Util.java
similarity index 100%
rename from trunk/MMTk/src/org/mmtk/vm/gcspy/Util.java
rename to MMTk/src/org/mmtk/vm/gcspy/Util.java
diff --git a/trunk/NEWS.txt b/NEWS.txt
similarity index 100%
rename from trunk/NEWS.txt
rename to NEWS.txt
diff --git a/trunk/bin/buildit b/bin/buildit
similarity index 100%
rename from trunk/bin/buildit
rename to bin/buildit
diff --git a/trunk/bin/buildit.base_config b/bin/buildit.base_config
similarity index 100%
rename from trunk/bin/buildit.base_config
rename to bin/buildit.base_config
diff --git a/trunk/bin/extractcompilerstats b/bin/extractcompilerstats
similarity index 100%
rename from trunk/bin/extractcompilerstats
rename to bin/extractcompilerstats
diff --git a/trunk/bin/extractmmtkstats b/bin/extractmmtkstats
similarity index 100%
rename from trunk/bin/extractmmtkstats
rename to bin/extractmmtkstats
diff --git a/trunk/bin/findDeviantFiles.sh b/bin/findDeviantFiles.sh
similarity index 100%
rename from trunk/bin/findDeviantFiles.sh
rename to bin/findDeviantFiles.sh
diff --git a/trunk/bin/headerExceptionsFilter.awk b/bin/headerExceptionsFilter.awk
similarity index 100%
rename from trunk/bin/headerExceptionsFilter.awk
rename to bin/headerExceptionsFilter.awk
diff --git a/trunk/bin/license-check.rb b/bin/license-check.rb
similarity index 100%
rename from trunk/bin/license-check.rb
rename to bin/license-check.rb
diff --git a/trunk/bin/normalizeSVNProperties.sh b/bin/normalizeSVNProperties.sh
similarity index 100%
rename from trunk/bin/normalizeSVNProperties.sh
rename to bin/normalizeSVNProperties.sh
diff --git a/trunk/bin/test-mmtk b/bin/test-mmtk
similarity index 100%
rename from trunk/bin/test-mmtk
rename to bin/test-mmtk
diff --git a/trunk/bin/timedrun b/bin/timedrun
similarity index 100%
rename from trunk/bin/timedrun
rename to bin/timedrun
diff --git a/trunk/bin/unit-test-mmtk b/bin/unit-test-mmtk
similarity index 100%
rename from trunk/bin/unit-test-mmtk
rename to bin/unit-test-mmtk
diff --git a/trunk/build.xml b/build.xml
similarity index 100%
rename from trunk/build.xml
rename to build.xml
diff --git a/trunk/build/base.xml b/build/base.xml
similarity index 100%
rename from trunk/build/base.xml
rename to build/base.xml
diff --git a/trunk/build/checkstyle/License-Header.txt b/build/checkstyle/License-Header.txt
similarity index 100%
rename from trunk/build/checkstyle/License-Header.txt
rename to build/checkstyle/License-Header.txt
diff --git a/trunk/build/checkstyle/rvm-checks.xml b/build/checkstyle/rvm-checks.xml
similarity index 100%
rename from trunk/build/checkstyle/rvm-checks.xml
rename to build/checkstyle/rvm-checks.xml
diff --git a/trunk/build/checkstyle/text-output.xsl b/build/checkstyle/text-output.xsl
similarity index 100%
rename from trunk/build/checkstyle/text-output.xsl
rename to build/checkstyle/text-output.xsl
diff --git a/trunk/build/components/asm.xml b/build/components/asm.xml
similarity index 100%
rename from trunk/build/components/asm.xml
rename to build/components/asm.xml
diff --git a/trunk/build/components/base.xml b/build/components/base.xml
similarity index 100%
rename from trunk/build/components/base.xml
rename to build/components/base.xml
diff --git a/trunk/build/components/caffeinemark.xml b/build/components/caffeinemark.xml
similarity index 100%
rename from trunk/build/components/caffeinemark.xml
rename to build/components/caffeinemark.xml
diff --git a/trunk/build/components/checkstyle.xml b/build/components/checkstyle.xml
similarity index 100%
rename from trunk/build/components/checkstyle.xml
rename to build/components/checkstyle.xml
diff --git a/trunk/build/components/classpath.xml b/build/components/classpath.xml
similarity index 100%
rename from trunk/build/components/classpath.xml
rename to build/components/classpath.xml
diff --git a/trunk/build/components/dacapo.xml b/build/components/dacapo.xml
similarity index 100%
rename from trunk/build/components/dacapo.xml
rename to build/components/dacapo.xml
diff --git a/trunk/build/components/ecj.xml b/build/components/ecj.xml
similarity index 100%
rename from trunk/build/components/ecj.xml
rename to build/components/ecj.xml
diff --git a/trunk/build/components/gcspy.xml b/build/components/gcspy.xml
similarity index 100%
rename from trunk/build/components/gcspy.xml
rename to build/components/gcspy.xml
diff --git a/trunk/build/components/harmony.xml b/build/components/harmony.xml
similarity index 100%
rename from trunk/build/components/harmony.xml
rename to build/components/harmony.xml
diff --git a/trunk/build/components/jai.xml b/build/components/jai.xml
similarity index 100%
rename from trunk/build/components/jai.xml
rename to build/components/jai.xml
diff --git a/trunk/build/components/javacc.xml b/build/components/javacc.xml
similarity index 100%
rename from trunk/build/components/javacc.xml
rename to build/components/javacc.xml
diff --git a/trunk/build/components/jdocs.xml b/build/components/jdocs.xml
similarity index 100%
rename from trunk/build/components/jdocs.xml
rename to build/components/jdocs.xml
diff --git a/trunk/build/components/jsr166-tck.xml b/build/components/jsr166-tck.xml
similarity index 100%
rename from trunk/build/components/jsr166-tck.xml
rename to build/components/jsr166-tck.xml
diff --git a/trunk/build/components/junit.xml b/build/components/junit.xml
similarity index 100%
rename from trunk/build/components/junit.xml
rename to build/components/junit.xml
diff --git a/trunk/build/components/patches/classpath-cvs.RVM-443.patch b/build/components/patches/classpath-cvs.RVM-443.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-cvs.RVM-443.patch
rename to build/components/patches/classpath-cvs.RVM-443.patch
diff --git a/trunk/build/components/patches/classpath-cvs.RVM-644.patch b/build/components/patches/classpath-cvs.RVM-644.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-cvs.RVM-644.patch
rename to build/components/patches/classpath-cvs.RVM-644.patch
diff --git a/trunk/build/components/patches/classpath-cvs.RVM-732.patch b/build/components/patches/classpath-cvs.RVM-732.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-cvs.RVM-732.patch
rename to build/components/patches/classpath-cvs.RVM-732.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-185.patch b/build/components/patches/classpath-web.RVM-185.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-185.patch
rename to build/components/patches/classpath-web.RVM-185.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-01.patch b/build/components/patches/classpath-web.RVM-266-01.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-01.patch
rename to build/components/patches/classpath-web.RVM-266-01.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-02.patch b/build/components/patches/classpath-web.RVM-266-02.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-02.patch
rename to build/components/patches/classpath-web.RVM-266-02.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-03.patch b/build/components/patches/classpath-web.RVM-266-03.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-03.patch
rename to build/components/patches/classpath-web.RVM-266-03.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-04.patch b/build/components/patches/classpath-web.RVM-266-04.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-04.patch
rename to build/components/patches/classpath-web.RVM-266-04.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-05.patch b/build/components/patches/classpath-web.RVM-266-05.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-05.patch
rename to build/components/patches/classpath-web.RVM-266-05.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-06.patch b/build/components/patches/classpath-web.RVM-266-06.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-06.patch
rename to build/components/patches/classpath-web.RVM-266-06.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-07.patch b/build/components/patches/classpath-web.RVM-266-07.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-07.patch
rename to build/components/patches/classpath-web.RVM-266-07.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-08.patch b/build/components/patches/classpath-web.RVM-266-08.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-08.patch
rename to build/components/patches/classpath-web.RVM-266-08.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-09.patch b/build/components/patches/classpath-web.RVM-266-09.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-09.patch
rename to build/components/patches/classpath-web.RVM-266-09.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-266-10.patch b/build/components/patches/classpath-web.RVM-266-10.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-266-10.patch
rename to build/components/patches/classpath-web.RVM-266-10.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-385-01.patch b/build/components/patches/classpath-web.RVM-385-01.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-385-01.patch
rename to build/components/patches/classpath-web.RVM-385-01.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-385-02.patch b/build/components/patches/classpath-web.RVM-385-02.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-385-02.patch
rename to build/components/patches/classpath-web.RVM-385-02.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-385-03.patch b/build/components/patches/classpath-web.RVM-385-03.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-385-03.patch
rename to build/components/patches/classpath-web.RVM-385-03.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-385-04.patch b/build/components/patches/classpath-web.RVM-385-04.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-385-04.patch
rename to build/components/patches/classpath-web.RVM-385-04.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-392.patch b/build/components/patches/classpath-web.RVM-392.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-392.patch
rename to build/components/patches/classpath-web.RVM-392.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-433.patch b/build/components/patches/classpath-web.RVM-433.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-433.patch
rename to build/components/patches/classpath-web.RVM-433.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-437.patch b/build/components/patches/classpath-web.RVM-437.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-437.patch
rename to build/components/patches/classpath-web.RVM-437.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-443.patch b/build/components/patches/classpath-web.RVM-443.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-443.patch
rename to build/components/patches/classpath-web.RVM-443.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-451.patch b/build/components/patches/classpath-web.RVM-451.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-451.patch
rename to build/components/patches/classpath-web.RVM-451.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-490-01.patch b/build/components/patches/classpath-web.RVM-490-01.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-490-01.patch
rename to build/components/patches/classpath-web.RVM-490-01.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-490-02.patch b/build/components/patches/classpath-web.RVM-490-02.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-490-02.patch
rename to build/components/patches/classpath-web.RVM-490-02.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-490-03.patch b/build/components/patches/classpath-web.RVM-490-03.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-490-03.patch
rename to build/components/patches/classpath-web.RVM-490-03.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-490-04.patch b/build/components/patches/classpath-web.RVM-490-04.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-490-04.patch
rename to build/components/patches/classpath-web.RVM-490-04.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-526.patch b/build/components/patches/classpath-web.RVM-526.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-526.patch
rename to build/components/patches/classpath-web.RVM-526.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-644.patch b/build/components/patches/classpath-web.RVM-644.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-644.patch
rename to build/components/patches/classpath-web.RVM-644.patch
diff --git a/trunk/build/components/patches/classpath-web.RVM-732.patch b/build/components/patches/classpath-web.RVM-732.patch
similarity index 100%
rename from trunk/build/components/patches/classpath-web.RVM-732.patch
rename to build/components/patches/classpath-web.RVM-732.patch
diff --git a/trunk/build/components/patches/harmony-svn.RVM-358-01.patch b/build/components/patches/harmony-svn.RVM-358-01.patch
similarity index 100%
rename from trunk/build/components/patches/harmony-svn.RVM-358-01.patch
rename to build/components/patches/harmony-svn.RVM-358-01.patch
diff --git a/trunk/build/components/pmd.xml b/build/components/pmd.xml
similarity index 100%
rename from trunk/build/components/pmd.xml
rename to build/components/pmd.xml
diff --git a/trunk/build/components/specjvm.xml b/build/components/specjvm.xml
similarity index 100%
rename from trunk/build/components/specjvm.xml
rename to build/components/specjvm.xml
diff --git a/trunk/build/components/x10.xml b/build/components/x10.xml
similarity index 100%
rename from trunk/build/components/x10.xml
rename to build/components/x10.xml
diff --git a/trunk/build/configs/BaseAdaptiveCopyMS.properties b/build/configs/BaseAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptiveCopyMS.properties
rename to build/configs/BaseAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/BaseAdaptiveGenImmix.properties b/build/configs/BaseAdaptiveGenImmix.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptiveGenImmix.properties
rename to build/configs/BaseAdaptiveGenImmix.properties
diff --git a/trunk/build/configs/BaseAdaptiveGenMS.properties b/build/configs/BaseAdaptiveGenMS.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptiveGenMS.properties
rename to build/configs/BaseAdaptiveGenMS.properties
diff --git a/trunk/build/configs/BaseAdaptiveMarkSweep.properties b/build/configs/BaseAdaptiveMarkSweep.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptiveMarkSweep.properties
rename to build/configs/BaseAdaptiveMarkSweep.properties
diff --git a/trunk/build/configs/BaseAdaptivePoisoned.properties b/build/configs/BaseAdaptivePoisoned.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptivePoisoned.properties
rename to build/configs/BaseAdaptivePoisoned.properties
diff --git a/trunk/build/configs/BaseAdaptiveSemiSpace.properties b/build/configs/BaseAdaptiveSemiSpace.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptiveSemiSpace.properties
rename to build/configs/BaseAdaptiveSemiSpace.properties
diff --git a/trunk/build/configs/BaseAdaptiveSemiSpaceGCSpy.properties b/build/configs/BaseAdaptiveSemiSpaceGCSpy.properties
similarity index 100%
rename from trunk/build/configs/BaseAdaptiveSemiSpaceGCSpy.properties
rename to build/configs/BaseAdaptiveSemiSpaceGCSpy.properties
diff --git a/trunk/build/configs/BaseBaseCopyMS.properties b/build/configs/BaseBaseCopyMS.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseCopyMS.properties
rename to build/configs/BaseBaseCopyMS.properties
diff --git a/trunk/build/configs/BaseBaseGCTrace.properties b/build/configs/BaseBaseGCTrace.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseGCTrace.properties
rename to build/configs/BaseBaseGCTrace.properties
diff --git a/trunk/build/configs/BaseBaseGenCopy.properties b/build/configs/BaseBaseGenCopy.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseGenCopy.properties
rename to build/configs/BaseBaseGenCopy.properties
diff --git a/trunk/build/configs/BaseBaseGenImmix.properties b/build/configs/BaseBaseGenImmix.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseGenImmix.properties
rename to build/configs/BaseBaseGenImmix.properties
diff --git a/trunk/build/configs/BaseBaseGenMS.properties b/build/configs/BaseBaseGenMS.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseGenMS.properties
rename to build/configs/BaseBaseGenMS.properties
diff --git a/trunk/build/configs/BaseBaseGenRC.properties b/build/configs/BaseBaseGenRC.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseGenRC.properties
rename to build/configs/BaseBaseGenRC.properties
diff --git a/trunk/build/configs/BaseBaseImmix.properties b/build/configs/BaseBaseImmix.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseImmix.properties
rename to build/configs/BaseBaseImmix.properties
diff --git a/trunk/build/configs/BaseBaseMarkCompact.properties b/build/configs/BaseBaseMarkCompact.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseMarkCompact.properties
rename to build/configs/BaseBaseMarkCompact.properties
diff --git a/trunk/build/configs/BaseBaseMarkSweep.properties b/build/configs/BaseBaseMarkSweep.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseMarkSweep.properties
rename to build/configs/BaseBaseMarkSweep.properties
diff --git a/trunk/build/configs/BaseBaseNoGC.properties b/build/configs/BaseBaseNoGC.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseNoGC.properties
rename to build/configs/BaseBaseNoGC.properties
diff --git a/trunk/build/configs/BaseBasePoisoned.properties b/build/configs/BaseBasePoisoned.properties
similarity index 100%
rename from trunk/build/configs/BaseBasePoisoned.properties
rename to build/configs/BaseBasePoisoned.properties
diff --git a/trunk/build/configs/BaseBaseRefCount.properties b/build/configs/BaseBaseRefCount.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseRefCount.properties
rename to build/configs/BaseBaseRefCount.properties
diff --git a/trunk/build/configs/BaseBaseSemiSpace.properties b/build/configs/BaseBaseSemiSpace.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseSemiSpace.properties
rename to build/configs/BaseBaseSemiSpace.properties
diff --git a/trunk/build/configs/BaseBaseSemiSpaceGCSpy.properties b/build/configs/BaseBaseSemiSpaceGCSpy.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseSemiSpaceGCSpy.properties
rename to build/configs/BaseBaseSemiSpaceGCSpy.properties
diff --git a/trunk/build/configs/BaseBaseSemiSpaceGCSpyStub.properties b/build/configs/BaseBaseSemiSpaceGCSpyStub.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseSemiSpaceGCSpyStub.properties
rename to build/configs/BaseBaseSemiSpaceGCSpyStub.properties
diff --git a/trunk/build/configs/BaseBaseStickyImmix.properties b/build/configs/BaseBaseStickyImmix.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseStickyImmix.properties
rename to build/configs/BaseBaseStickyImmix.properties
diff --git a/trunk/build/configs/BaseBaseStickyMS.properties b/build/configs/BaseBaseStickyMS.properties
similarity index 100%
rename from trunk/build/configs/BaseBaseStickyMS.properties
rename to build/configs/BaseBaseStickyMS.properties
diff --git a/trunk/build/configs/ExtremeAssertionsBaseBaseCopyMS.properties b/build/configs/ExtremeAssertionsBaseBaseCopyMS.properties
similarity index 100%
rename from trunk/build/configs/ExtremeAssertionsBaseBaseCopyMS.properties
rename to build/configs/ExtremeAssertionsBaseBaseCopyMS.properties
diff --git a/trunk/build/configs/ExtremeAssertionsBaseBaseGenMS.properties b/build/configs/ExtremeAssertionsBaseBaseGenMS.properties
similarity index 100%
rename from trunk/build/configs/ExtremeAssertionsBaseBaseGenMS.properties
rename to build/configs/ExtremeAssertionsBaseBaseGenMS.properties
diff --git a/trunk/build/configs/ExtremeAssertionsBaseBaseSemiSpace.properties b/build/configs/ExtremeAssertionsBaseBaseSemiSpace.properties
similarity index 100%
rename from trunk/build/configs/ExtremeAssertionsBaseBaseSemiSpace.properties
rename to build/configs/ExtremeAssertionsBaseBaseSemiSpace.properties
diff --git a/trunk/build/configs/ExtremeAssertionsFullAdaptiveCopyMS.properties b/build/configs/ExtremeAssertionsFullAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/ExtremeAssertionsFullAdaptiveCopyMS.properties
rename to build/configs/ExtremeAssertionsFullAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/ExtremeAssertionsFullBaseAdaptiveCopyMS.properties b/build/configs/ExtremeAssertionsFullBaseAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/ExtremeAssertionsFullBaseAdaptiveCopyMS.properties
rename to build/configs/ExtremeAssertionsFullBaseAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/ExtremeAssertionsOptAdaptiveCopyMS.properties b/build/configs/ExtremeAssertionsOptAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/ExtremeAssertionsOptAdaptiveCopyMS.properties
rename to build/configs/ExtremeAssertionsOptAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/FastAdaptiveCopyMS.properties b/build/configs/FastAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveCopyMS.properties
rename to build/configs/FastAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/FastAdaptiveGCTrace.properties b/build/configs/FastAdaptiveGCTrace.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveGCTrace.properties
rename to build/configs/FastAdaptiveGCTrace.properties
diff --git a/trunk/build/configs/FastAdaptiveGenCopy.properties b/build/configs/FastAdaptiveGenCopy.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveGenCopy.properties
rename to build/configs/FastAdaptiveGenCopy.properties
diff --git a/trunk/build/configs/FastAdaptiveGenImmix.properties b/build/configs/FastAdaptiveGenImmix.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveGenImmix.properties
rename to build/configs/FastAdaptiveGenImmix.properties
diff --git a/trunk/build/configs/FastAdaptiveGenMS.properties b/build/configs/FastAdaptiveGenMS.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveGenMS.properties
rename to build/configs/FastAdaptiveGenMS.properties
diff --git a/trunk/build/configs/FastAdaptiveGenRC.properties b/build/configs/FastAdaptiveGenRC.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveGenRC.properties
rename to build/configs/FastAdaptiveGenRC.properties
diff --git a/trunk/build/configs/FastAdaptiveImmix.properties b/build/configs/FastAdaptiveImmix.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveImmix.properties
rename to build/configs/FastAdaptiveImmix.properties
diff --git a/trunk/build/configs/FastAdaptiveMarkCompact.properties b/build/configs/FastAdaptiveMarkCompact.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveMarkCompact.properties
rename to build/configs/FastAdaptiveMarkCompact.properties
diff --git a/trunk/build/configs/FastAdaptiveMarkSweep.properties b/build/configs/FastAdaptiveMarkSweep.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveMarkSweep.properties
rename to build/configs/FastAdaptiveMarkSweep.properties
diff --git a/trunk/build/configs/FastAdaptiveNoGC.properties b/build/configs/FastAdaptiveNoGC.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveNoGC.properties
rename to build/configs/FastAdaptiveNoGC.properties
diff --git a/trunk/build/configs/FastAdaptivePoisoned.properties b/build/configs/FastAdaptivePoisoned.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptivePoisoned.properties
rename to build/configs/FastAdaptivePoisoned.properties
diff --git a/trunk/build/configs/FastAdaptiveRefCount.properties b/build/configs/FastAdaptiveRefCount.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveRefCount.properties
rename to build/configs/FastAdaptiveRefCount.properties
diff --git a/trunk/build/configs/FastAdaptiveSemiSpace.properties b/build/configs/FastAdaptiveSemiSpace.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveSemiSpace.properties
rename to build/configs/FastAdaptiveSemiSpace.properties
diff --git a/trunk/build/configs/FastAdaptiveStickyImmix.properties b/build/configs/FastAdaptiveStickyImmix.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveStickyImmix.properties
rename to build/configs/FastAdaptiveStickyImmix.properties
diff --git a/trunk/build/configs/FastAdaptiveStickyMS.properties b/build/configs/FastAdaptiveStickyMS.properties
similarity index 100%
rename from trunk/build/configs/FastAdaptiveStickyMS.properties
rename to build/configs/FastAdaptiveStickyMS.properties
diff --git a/trunk/build/configs/FastBaseAdaptiveCopyMS.properties b/build/configs/FastBaseAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/FastBaseAdaptiveCopyMS.properties
rename to build/configs/FastBaseAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/FastBaseAdaptiveGenMS.properties b/build/configs/FastBaseAdaptiveGenMS.properties
similarity index 100%
rename from trunk/build/configs/FastBaseAdaptiveGenMS.properties
rename to build/configs/FastBaseAdaptiveGenMS.properties
diff --git a/trunk/build/configs/FastBaseBaseSemiSpace.properties b/build/configs/FastBaseBaseSemiSpace.properties
similarity index 100%
rename from trunk/build/configs/FastBaseBaseSemiSpace.properties
rename to build/configs/FastBaseBaseSemiSpace.properties
diff --git a/trunk/build/configs/FullAdaptiveCopyMS.properties b/build/configs/FullAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveCopyMS.properties
rename to build/configs/FullAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/FullAdaptiveGCTrace.properties b/build/configs/FullAdaptiveGCTrace.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveGCTrace.properties
rename to build/configs/FullAdaptiveGCTrace.properties
diff --git a/trunk/build/configs/FullAdaptiveGenCopy.properties b/build/configs/FullAdaptiveGenCopy.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveGenCopy.properties
rename to build/configs/FullAdaptiveGenCopy.properties
diff --git a/trunk/build/configs/FullAdaptiveGenImmix.properties b/build/configs/FullAdaptiveGenImmix.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveGenImmix.properties
rename to build/configs/FullAdaptiveGenImmix.properties
diff --git a/trunk/build/configs/FullAdaptiveGenMS.properties b/build/configs/FullAdaptiveGenMS.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveGenMS.properties
rename to build/configs/FullAdaptiveGenMS.properties
diff --git a/trunk/build/configs/FullAdaptiveGenRC.properties b/build/configs/FullAdaptiveGenRC.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveGenRC.properties
rename to build/configs/FullAdaptiveGenRC.properties
diff --git a/trunk/build/configs/FullAdaptiveImmix.properties b/build/configs/FullAdaptiveImmix.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveImmix.properties
rename to build/configs/FullAdaptiveImmix.properties
diff --git a/trunk/build/configs/FullAdaptiveMarkCompact.properties b/build/configs/FullAdaptiveMarkCompact.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveMarkCompact.properties
rename to build/configs/FullAdaptiveMarkCompact.properties
diff --git a/trunk/build/configs/FullAdaptiveMarkSweep.properties b/build/configs/FullAdaptiveMarkSweep.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveMarkSweep.properties
rename to build/configs/FullAdaptiveMarkSweep.properties
diff --git a/trunk/build/configs/FullAdaptiveNoGC.properties b/build/configs/FullAdaptiveNoGC.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveNoGC.properties
rename to build/configs/FullAdaptiveNoGC.properties
diff --git a/trunk/build/configs/FullAdaptivePoisoned.properties b/build/configs/FullAdaptivePoisoned.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptivePoisoned.properties
rename to build/configs/FullAdaptivePoisoned.properties
diff --git a/trunk/build/configs/FullAdaptiveRefCount.properties b/build/configs/FullAdaptiveRefCount.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveRefCount.properties
rename to build/configs/FullAdaptiveRefCount.properties
diff --git a/trunk/build/configs/FullAdaptiveSemiSpace.properties b/build/configs/FullAdaptiveSemiSpace.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveSemiSpace.properties
rename to build/configs/FullAdaptiveSemiSpace.properties
diff --git a/trunk/build/configs/FullAdaptiveSemiSpaceGCSpy.properties b/build/configs/FullAdaptiveSemiSpaceGCSpy.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveSemiSpaceGCSpy.properties
rename to build/configs/FullAdaptiveSemiSpaceGCSpy.properties
diff --git a/trunk/build/configs/FullAdaptiveStickyImmix.properties b/build/configs/FullAdaptiveStickyImmix.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveStickyImmix.properties
rename to build/configs/FullAdaptiveStickyImmix.properties
diff --git a/trunk/build/configs/FullAdaptiveStickyMS.properties b/build/configs/FullAdaptiveStickyMS.properties
similarity index 100%
rename from trunk/build/configs/FullAdaptiveStickyMS.properties
rename to build/configs/FullAdaptiveStickyMS.properties
diff --git a/trunk/build/configs/FullBaseAdaptiveCopyMS.properties b/build/configs/FullBaseAdaptiveCopyMS.properties
similarity index 100%
rename from trunk/build/configs/FullBaseAdaptiveCopyMS.properties
rename to build/configs/FullBaseAdaptiveCopyMS.properties
diff --git a/trunk/build/configs/config.properties.defaults b/build/configs/config.properties.defaults
similarity index 100%
rename from trunk/build/configs/config.properties.defaults
rename to build/configs/config.properties.defaults
diff --git a/trunk/build/configs/config.properties.example b/build/configs/config.properties.example
similarity index 100%
rename from trunk/build/configs/config.properties.example
rename to build/configs/config.properties.example
diff --git a/trunk/build/configs/development.properties b/build/configs/development.properties
similarity index 100%
rename from trunk/build/configs/development.properties
rename to build/configs/development.properties
diff --git a/trunk/build/configs/gcstress.properties b/build/configs/gcstress.properties
similarity index 100%
rename from trunk/build/configs/gcstress.properties
rename to build/configs/gcstress.properties
diff --git a/trunk/build/configs/production.properties b/build/configs/production.properties
similarity index 100%
rename from trunk/build/configs/production.properties
rename to build/configs/production.properties
diff --git a/trunk/build/configs/production_Base.properties b/build/configs/production_Base.properties
similarity index 100%
rename from trunk/build/configs/production_Base.properties
rename to build/configs/production_Base.properties
diff --git a/trunk/build/configs/production_Opt_0.properties b/build/configs/production_Opt_0.properties
similarity index 100%
rename from trunk/build/configs/production_Opt_0.properties
rename to build/configs/production_Opt_0.properties
diff --git a/trunk/build/configs/production_Opt_1.properties b/build/configs/production_Opt_1.properties
similarity index 100%
rename from trunk/build/configs/production_Opt_1.properties
rename to build/configs/production_Opt_1.properties
diff --git a/trunk/build/configs/production_Opt_2.properties b/build/configs/production_Opt_2.properties
similarity index 100%
rename from trunk/build/configs/production_Opt_2.properties
rename to build/configs/production_Opt_2.properties
diff --git a/trunk/build/configs/prototype-opt.properties b/build/configs/prototype-opt.properties
similarity index 100%
rename from trunk/build/configs/prototype-opt.properties
rename to build/configs/prototype-opt.properties
diff --git a/trunk/build/configs/prototype.properties b/build/configs/prototype.properties
similarity index 100%
rename from trunk/build/configs/prototype.properties
rename to build/configs/prototype.properties
diff --git a/trunk/build/eclipse/classpath.harmony.template b/build/eclipse/classpath.harmony.template
similarity index 100%
rename from trunk/build/eclipse/classpath.harmony.template
rename to build/eclipse/classpath.harmony.template
diff --git a/trunk/build/eclipse/classpath.template b/build/eclipse/classpath.template
similarity index 100%
rename from trunk/build/eclipse/classpath.template
rename to build/eclipse/classpath.template
diff --git a/trunk/build/eclipse/mmtk-harness-classpath b/build/eclipse/mmtk-harness-classpath
similarity index 100%
rename from trunk/build/eclipse/mmtk-harness-classpath
rename to build/eclipse/mmtk-harness-classpath
diff --git a/trunk/build/eclipse/mmtk-harness-project b/build/eclipse/mmtk-harness-project
similarity index 100%
rename from trunk/build/eclipse/mmtk-harness-project
rename to build/eclipse/mmtk-harness-project
diff --git a/trunk/build/eclipse/project.template b/build/eclipse/project.template
similarity index 100%
rename from trunk/build/eclipse/project.template
rename to build/eclipse/project.template
diff --git a/trunk/build/hosts/ia32-cygwin.properties b/build/hosts/ia32-cygwin.properties
similarity index 100%
rename from trunk/build/hosts/ia32-cygwin.properties
rename to build/hosts/ia32-cygwin.properties
diff --git a/trunk/build/hosts/ia32-linux.properties b/build/hosts/ia32-linux.properties
similarity index 100%
rename from trunk/build/hosts/ia32-linux.properties
rename to build/hosts/ia32-linux.properties
diff --git a/trunk/build/hosts/ia32-osx.properties b/build/hosts/ia32-osx.properties
similarity index 100%
rename from trunk/build/hosts/ia32-osx.properties
rename to build/hosts/ia32-osx.properties
diff --git a/trunk/build/hosts/ia32-solaris.properties b/build/hosts/ia32-solaris.properties
similarity index 100%
rename from trunk/build/hosts/ia32-solaris.properties
rename to build/hosts/ia32-solaris.properties
diff --git a/trunk/build/hosts/ppc32-aix.properties b/build/hosts/ppc32-aix.properties
similarity index 100%
rename from trunk/build/hosts/ppc32-aix.properties
rename to build/hosts/ppc32-aix.properties
diff --git a/trunk/build/hosts/ppc32-linux.properties b/build/hosts/ppc32-linux.properties
similarity index 100%
rename from trunk/build/hosts/ppc32-linux.properties
rename to build/hosts/ppc32-linux.properties
diff --git a/trunk/build/hosts/ppc32-osx.properties b/build/hosts/ppc32-osx.properties
similarity index 100%
rename from trunk/build/hosts/ppc32-osx.properties
rename to build/hosts/ppc32-osx.properties
diff --git a/trunk/build/hosts/ppc64-aix.properties b/build/hosts/ppc64-aix.properties
similarity index 100%
rename from trunk/build/hosts/ppc64-aix.properties
rename to build/hosts/ppc64-aix.properties
diff --git a/trunk/build/hosts/ppc64-linux.properties b/build/hosts/ppc64-linux.properties
similarity index 100%
rename from trunk/build/hosts/ppc64-linux.properties
rename to build/hosts/ppc64-linux.properties
diff --git a/trunk/build/hosts/x86_64-linux.properties b/build/hosts/x86_64-linux.properties
similarity index 100%
rename from trunk/build/hosts/x86_64-linux.properties
rename to build/hosts/x86_64-linux.properties
diff --git a/trunk/build/hosts/x86_64_m64-linux.properties b/build/hosts/x86_64_m64-linux.properties
similarity index 100%
rename from trunk/build/hosts/x86_64_m64-linux.properties
rename to build/hosts/x86_64_m64-linux.properties
diff --git a/trunk/build/mmtk/default.properties b/build/mmtk/default.properties
similarity index 100%
rename from trunk/build/mmtk/default.properties
rename to build/mmtk/default.properties
diff --git a/trunk/build/mmtk/sideMarkBit.properties b/build/mmtk/sideMarkBit.properties
similarity index 100%
rename from trunk/build/mmtk/sideMarkBit.properties
rename to build/mmtk/sideMarkBit.properties
diff --git a/trunk/build/pmd/rulesets/rvm.xml b/build/pmd/rulesets/rvm.xml
similarity index 100%
rename from trunk/build/pmd/rulesets/rvm.xml
rename to build/pmd/rulesets/rvm.xml
diff --git a/trunk/build/primordials/Classpath-0.97.2.txt b/build/primordials/Classpath-0.97.2.txt
similarity index 100%
rename from trunk/build/primordials/Classpath-0.97.2.txt
rename to build/primordials/Classpath-0.97.2.txt
diff --git a/trunk/build/primordials/Harmony.txt b/build/primordials/Harmony.txt
similarity index 100%
rename from trunk/build/primordials/Harmony.txt
rename to build/primordials/Harmony.txt
diff --git a/trunk/build/primordials/RVM.txt b/build/primordials/RVM.txt
similarity index 100%
rename from trunk/build/primordials/RVM.txt
rename to build/primordials/RVM.txt
diff --git a/trunk/build/primordials/RVM_AOS.txt b/build/primordials/RVM_AOS.txt
similarity index 100%
rename from trunk/build/primordials/RVM_AOS.txt
rename to build/primordials/RVM_AOS.txt
diff --git a/trunk/build/primordials/RVM_IA32.txt b/build/primordials/RVM_IA32.txt
similarity index 100%
rename from trunk/build/primordials/RVM_IA32.txt
rename to build/primordials/RVM_IA32.txt
diff --git a/trunk/build/primordials/RVM_OPT.txt b/build/primordials/RVM_OPT.txt
similarity index 100%
rename from trunk/build/primordials/RVM_OPT.txt
rename to build/primordials/RVM_OPT.txt
diff --git a/trunk/build/primordials/RVM_PPC.txt b/build/primordials/RVM_PPC.txt
similarity index 100%
rename from trunk/build/primordials/RVM_PPC.txt
rename to build/primordials/RVM_PPC.txt
diff --git a/trunk/build/results2report.xsl b/build/results2report.xsl
similarity index 100%
rename from trunk/build/results2report.xsl
rename to build/results2report.xsl
diff --git a/trunk/build/targets/ia32-linux.properties b/build/targets/ia32-linux.properties
similarity index 100%
rename from trunk/build/targets/ia32-linux.properties
rename to build/targets/ia32-linux.properties
diff --git a/trunk/build/targets/ia32-osx.properties b/build/targets/ia32-osx.properties
similarity index 100%
rename from trunk/build/targets/ia32-osx.properties
rename to build/targets/ia32-osx.properties
diff --git a/trunk/build/targets/ia32-solaris.properties b/build/targets/ia32-solaris.properties
similarity index 100%
rename from trunk/build/targets/ia32-solaris.properties
rename to build/targets/ia32-solaris.properties
diff --git a/trunk/build/targets/ppc32-aix.properties b/build/targets/ppc32-aix.properties
similarity index 100%
rename from trunk/build/targets/ppc32-aix.properties
rename to build/targets/ppc32-aix.properties
diff --git a/trunk/build/targets/ppc32-linux.properties b/build/targets/ppc32-linux.properties
similarity index 100%
rename from trunk/build/targets/ppc32-linux.properties
rename to build/targets/ppc32-linux.properties
diff --git a/trunk/build/targets/ppc32-osx.properties b/build/targets/ppc32-osx.properties
similarity index 100%
rename from trunk/build/targets/ppc32-osx.properties
rename to build/targets/ppc32-osx.properties
diff --git a/trunk/build/targets/ppc64-aix.properties b/build/targets/ppc64-aix.properties
similarity index 100%
rename from trunk/build/targets/ppc64-aix.properties
rename to build/targets/ppc64-aix.properties
diff --git a/trunk/build/targets/ppc64-linux.properties b/build/targets/ppc64-linux.properties
similarity index 100%
rename from trunk/build/targets/ppc64-linux.properties
rename to build/targets/ppc64-linux.properties
diff --git a/trunk/build/targets/target.properties.example b/build/targets/target.properties.example
similarity index 100%
rename from trunk/build/targets/target.properties.example
rename to build/targets/target.properties.example
diff --git a/trunk/build/targets/x86_64-linux.properties b/build/targets/x86_64-linux.properties
similarity index 100%
rename from trunk/build/targets/x86_64-linux.properties
rename to build/targets/x86_64-linux.properties
diff --git a/trunk/build/targets/x86_64_m64-linux.properties b/build/targets/x86_64_m64-linux.properties
similarity index 100%
rename from trunk/build/targets/x86_64_m64-linux.properties
rename to build/targets/x86_64_m64-linux.properties
diff --git a/trunk/build/tasks.xml b/build/tasks.xml
similarity index 100%
rename from trunk/build/tasks.xml
rename to build/tasks.xml
diff --git a/trunk/build/test-runs/SPECjvm2008.properties b/build/test-runs/SPECjvm2008.properties
similarity index 100%
rename from trunk/build/test-runs/SPECjvm2008.properties
rename to build/test-runs/SPECjvm2008.properties
diff --git a/trunk/build/test-runs/compiler-dna.properties b/build/test-runs/compiler-dna.properties
similarity index 100%
rename from trunk/build/test-runs/compiler-dna.properties
rename to build/test-runs/compiler-dna.properties
diff --git a/trunk/build/test-runs/core.properties b/build/test-runs/core.properties
similarity index 100%
rename from trunk/build/test-runs/core.properties
rename to build/test-runs/core.properties
diff --git a/trunk/build/test-runs/gcmap-sanity.properties b/build/test-runs/gcmap-sanity.properties
similarity index 100%
rename from trunk/build/test-runs/gcmap-sanity.properties
rename to build/test-runs/gcmap-sanity.properties
diff --git a/trunk/build/test-runs/jsr166.properties b/build/test-runs/jsr166.properties
similarity index 100%
rename from trunk/build/test-runs/jsr166.properties
rename to build/test-runs/jsr166.properties
diff --git a/trunk/build/test-runs/mmtk-unit-tests.properties b/build/test-runs/mmtk-unit-tests.properties
similarity index 100%
rename from trunk/build/test-runs/mmtk-unit-tests.properties
rename to build/test-runs/mmtk-unit-tests.properties
diff --git a/trunk/build/test-runs/perf.properties b/build/test-runs/perf.properties
similarity index 100%
rename from trunk/build/test-runs/perf.properties
rename to build/test-runs/perf.properties
diff --git a/trunk/build/test-runs/performance.properties b/build/test-runs/performance.properties
similarity index 100%
rename from trunk/build/test-runs/performance.properties
rename to build/test-runs/performance.properties
diff --git a/trunk/build/test-runs/pre-commit.properties b/build/test-runs/pre-commit.properties
similarity index 100%
rename from trunk/build/test-runs/pre-commit.properties
rename to build/test-runs/pre-commit.properties
diff --git a/trunk/build/test-runs/quarantine.properties b/build/test-runs/quarantine.properties
similarity index 100%
rename from trunk/build/test-runs/quarantine.properties
rename to build/test-runs/quarantine.properties
diff --git a/trunk/build/test-runs/sanity-tier2.properties b/build/test-runs/sanity-tier2.properties
similarity index 100%
rename from trunk/build/test-runs/sanity-tier2.properties
rename to build/test-runs/sanity-tier2.properties
diff --git a/trunk/build/test-runs/sanity.properties b/build/test-runs/sanity.properties
similarity index 100%
rename from trunk/build/test-runs/sanity.properties
rename to build/test-runs/sanity.properties
diff --git a/trunk/build/test-runs/stress.properties b/build/test-runs/stress.properties
similarity index 100%
rename from trunk/build/test-runs/stress.properties
rename to build/test-runs/stress.properties
diff --git a/trunk/build/test-runs/tiny.properties b/build/test-runs/tiny.properties
similarity index 100%
rename from trunk/build/test-runs/tiny.properties
rename to build/test-runs/tiny.properties
diff --git a/trunk/build/test-runs/x10.properties b/build/test-runs/x10.properties
similarity index 100%
rename from trunk/build/test-runs/x10.properties
rename to build/test-runs/x10.properties
diff --git a/trunk/build/testing/report2html.xsl b/build/testing/report2html.xsl
similarity index 100%
rename from trunk/build/testing/report2html.xsl
rename to build/testing/report2html.xsl
diff --git a/trunk/build/tests.xml b/build/tests.xml
similarity index 100%
rename from trunk/build/tests.xml
rename to build/tests.xml
diff --git a/trunk/common/options/LICENSE.txt b/common/options/LICENSE.txt
similarity index 100%
rename from trunk/common/options/LICENSE.txt
rename to common/options/LICENSE.txt
diff --git a/trunk/common/options/src/org/vmutil/options/AddressOption.java b/common/options/src/org/vmutil/options/AddressOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/AddressOption.java
rename to common/options/src/org/vmutil/options/AddressOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/BooleanOption.java b/common/options/src/org/vmutil/options/BooleanOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/BooleanOption.java
rename to common/options/src/org/vmutil/options/BooleanOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/EnumOption.java b/common/options/src/org/vmutil/options/EnumOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/EnumOption.java
rename to common/options/src/org/vmutil/options/EnumOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/FloatOption.java b/common/options/src/org/vmutil/options/FloatOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/FloatOption.java
rename to common/options/src/org/vmutil/options/FloatOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/IntOption.java b/common/options/src/org/vmutil/options/IntOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/IntOption.java
rename to common/options/src/org/vmutil/options/IntOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/MicrosecondsOption.java b/common/options/src/org/vmutil/options/MicrosecondsOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/MicrosecondsOption.java
rename to common/options/src/org/vmutil/options/MicrosecondsOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/Option.java b/common/options/src/org/vmutil/options/Option.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/Option.java
rename to common/options/src/org/vmutil/options/Option.java
diff --git a/trunk/common/options/src/org/vmutil/options/OptionSet.java b/common/options/src/org/vmutil/options/OptionSet.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/OptionSet.java
rename to common/options/src/org/vmutil/options/OptionSet.java
diff --git a/trunk/common/options/src/org/vmutil/options/PagesOption.java b/common/options/src/org/vmutil/options/PagesOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/PagesOption.java
rename to common/options/src/org/vmutil/options/PagesOption.java
diff --git a/trunk/common/options/src/org/vmutil/options/StringOption.java b/common/options/src/org/vmutil/options/StringOption.java
similarity index 100%
rename from trunk/common/options/src/org/vmutil/options/StringOption.java
rename to common/options/src/org/vmutil/options/StringOption.java
diff --git a/trunk/common/vmmagic/LICENSE.txt b/common/vmmagic/LICENSE.txt
similarity index 100%
rename from trunk/common/vmmagic/LICENSE.txt
rename to common/vmmagic/LICENSE.txt
diff --git a/trunk/common/vmmagic/src/org/vmmagic/Intrinsic.java b/common/vmmagic/src/org/vmmagic/Intrinsic.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/Intrinsic.java
rename to common/vmmagic/src/org/vmmagic/Intrinsic.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/Pragma.java b/common/vmmagic/src/org/vmmagic/Pragma.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/Pragma.java
rename to common/vmmagic/src/org/vmmagic/Pragma.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/Unboxed.java b/common/vmmagic/src/org/vmmagic/Unboxed.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/Unboxed.java
rename to common/vmmagic/src/org/vmmagic/Unboxed.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/BaselineNoRegisters.java b/common/vmmagic/src/org/vmmagic/pragma/BaselineNoRegisters.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/BaselineNoRegisters.java
rename to common/vmmagic/src/org/vmmagic/pragma/BaselineNoRegisters.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/BaselineSaveLSRegisters.java b/common/vmmagic/src/org/vmmagic/pragma/BaselineSaveLSRegisters.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/BaselineSaveLSRegisters.java
rename to common/vmmagic/src/org/vmmagic/pragma/BaselineSaveLSRegisters.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/DynamicBridge.java b/common/vmmagic/src/org/vmmagic/pragma/DynamicBridge.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/DynamicBridge.java
rename to common/vmmagic/src/org/vmmagic/pragma/DynamicBridge.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Entrypoint.java b/common/vmmagic/src/org/vmmagic/pragma/Entrypoint.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Entrypoint.java
rename to common/vmmagic/src/org/vmmagic/pragma/Entrypoint.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Inline.java b/common/vmmagic/src/org/vmmagic/pragma/Inline.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Inline.java
rename to common/vmmagic/src/org/vmmagic/pragma/Inline.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Interruptible.java b/common/vmmagic/src/org/vmmagic/pragma/Interruptible.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Interruptible.java
rename to common/vmmagic/src/org/vmmagic/pragma/Interruptible.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/LogicallyUninterruptible.java b/common/vmmagic/src/org/vmmagic/pragma/LogicallyUninterruptible.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/LogicallyUninterruptible.java
rename to common/vmmagic/src/org/vmmagic/pragma/LogicallyUninterruptible.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NativeBridge.java b/common/vmmagic/src/org/vmmagic/pragma/NativeBridge.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NativeBridge.java
rename to common/vmmagic/src/org/vmmagic/pragma/NativeBridge.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NoBoundsCheck.java b/common/vmmagic/src/org/vmmagic/pragma/NoBoundsCheck.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NoBoundsCheck.java
rename to common/vmmagic/src/org/vmmagic/pragma/NoBoundsCheck.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NoCheckStore.java b/common/vmmagic/src/org/vmmagic/pragma/NoCheckStore.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NoCheckStore.java
rename to common/vmmagic/src/org/vmmagic/pragma/NoCheckStore.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NoEscapes.java b/common/vmmagic/src/org/vmmagic/pragma/NoEscapes.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NoEscapes.java
rename to common/vmmagic/src/org/vmmagic/pragma/NoEscapes.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NoInline.java b/common/vmmagic/src/org/vmmagic/pragma/NoInline.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NoInline.java
rename to common/vmmagic/src/org/vmmagic/pragma/NoInline.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NoNullCheck.java b/common/vmmagic/src/org/vmmagic/pragma/NoNullCheck.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NoNullCheck.java
rename to common/vmmagic/src/org/vmmagic/pragma/NoNullCheck.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NoOptCompile.java b/common/vmmagic/src/org/vmmagic/pragma/NoOptCompile.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NoOptCompile.java
rename to common/vmmagic/src/org/vmmagic/pragma/NoOptCompile.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NonMoving.java b/common/vmmagic/src/org/vmmagic/pragma/NonMoving.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NonMoving.java
rename to common/vmmagic/src/org/vmmagic/pragma/NonMoving.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/NonMovingAllocation.java b/common/vmmagic/src/org/vmmagic/pragma/NonMovingAllocation.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/NonMovingAllocation.java
rename to common/vmmagic/src/org/vmmagic/pragma/NonMovingAllocation.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Preemptible.java b/common/vmmagic/src/org/vmmagic/pragma/Preemptible.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Preemptible.java
rename to common/vmmagic/src/org/vmmagic/pragma/Preemptible.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Pure.java b/common/vmmagic/src/org/vmmagic/pragma/Pure.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Pure.java
rename to common/vmmagic/src/org/vmmagic/pragma/Pure.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/RawStorage.java b/common/vmmagic/src/org/vmmagic/pragma/RawStorage.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/RawStorage.java
rename to common/vmmagic/src/org/vmmagic/pragma/RawStorage.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/RuntimeFinal.java b/common/vmmagic/src/org/vmmagic/pragma/RuntimeFinal.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/RuntimeFinal.java
rename to common/vmmagic/src/org/vmmagic/pragma/RuntimeFinal.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/RuntimePure.java b/common/vmmagic/src/org/vmmagic/pragma/RuntimePure.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/RuntimePure.java
rename to common/vmmagic/src/org/vmmagic/pragma/RuntimePure.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/SaveVolatile.java b/common/vmmagic/src/org/vmmagic/pragma/SaveVolatile.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/SaveVolatile.java
rename to common/vmmagic/src/org/vmmagic/pragma/SaveVolatile.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/SpecializedMethodInvoke.java b/common/vmmagic/src/org/vmmagic/pragma/SpecializedMethodInvoke.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/SpecializedMethodInvoke.java
rename to common/vmmagic/src/org/vmmagic/pragma/SpecializedMethodInvoke.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/SysCallNative.java b/common/vmmagic/src/org/vmmagic/pragma/SysCallNative.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/SysCallNative.java
rename to common/vmmagic/src/org/vmmagic/pragma/SysCallNative.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Uninterruptible.java b/common/vmmagic/src/org/vmmagic/pragma/Uninterruptible.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Uninterruptible.java
rename to common/vmmagic/src/org/vmmagic/pragma/Uninterruptible.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/UninterruptibleNoWarn.java b/common/vmmagic/src/org/vmmagic/pragma/UninterruptibleNoWarn.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/UninterruptibleNoWarn.java
rename to common/vmmagic/src/org/vmmagic/pragma/UninterruptibleNoWarn.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Unpreemptible.java b/common/vmmagic/src/org/vmmagic/pragma/Unpreemptible.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Unpreemptible.java
rename to common/vmmagic/src/org/vmmagic/pragma/Unpreemptible.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/UnpreemptibleNoWarn.java b/common/vmmagic/src/org/vmmagic/pragma/UnpreemptibleNoWarn.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/UnpreemptibleNoWarn.java
rename to common/vmmagic/src/org/vmmagic/pragma/UnpreemptibleNoWarn.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/pragma/Untraced.java b/common/vmmagic/src/org/vmmagic/pragma/Untraced.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/pragma/Untraced.java
rename to common/vmmagic/src/org/vmmagic/pragma/Untraced.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/Address.java b/common/vmmagic/src/org/vmmagic/unboxed/Address.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/Address.java
rename to common/vmmagic/src/org/vmmagic/unboxed/Address.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/AddressArray.java b/common/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
rename to common/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/Extent.java b/common/vmmagic/src/org/vmmagic/unboxed/Extent.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/Extent.java
rename to common/vmmagic/src/org/vmmagic/unboxed/Extent.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java b/common/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
rename to common/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java b/common/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
rename to common/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java b/common/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
rename to common/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/Offset.java b/common/vmmagic/src/org/vmmagic/unboxed/Offset.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/Offset.java
rename to common/vmmagic/src/org/vmmagic/unboxed/Offset.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java b/common/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
rename to common/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/Word.java b/common/vmmagic/src/org/vmmagic/unboxed/Word.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/Word.java
rename to common/vmmagic/src/org/vmmagic/unboxed/Word.java
diff --git a/trunk/common/vmmagic/src/org/vmmagic/unboxed/WordArray.java b/common/vmmagic/src/org/vmmagic/unboxed/WordArray.java
similarity index 100%
rename from trunk/common/vmmagic/src/org/vmmagic/unboxed/WordArray.java
rename to common/vmmagic/src/org/vmmagic/unboxed/WordArray.java
diff --git a/trunk/docs/images/README.txt b/docs/images/README.txt
similarity index 100%
rename from trunk/docs/images/README.txt
rename to docs/images/README.txt
diff --git a/trunk/docs/images/fat-jalapeno-pepper-combined.ico b/docs/images/fat-jalapeno-pepper-combined.ico
similarity index 100%
rename from trunk/docs/images/fat-jalapeno-pepper-combined.ico
rename to docs/images/fat-jalapeno-pepper-combined.ico
diff --git a/trunk/docs/images/fat-jalapeno-pepper-cropped-16x16.gif b/docs/images/fat-jalapeno-pepper-cropped-16x16.gif
similarity index 100%
rename from trunk/docs/images/fat-jalapeno-pepper-cropped-16x16.gif
rename to docs/images/fat-jalapeno-pepper-cropped-16x16.gif
diff --git a/trunk/docs/images/fat-jalapeno-pepper-cropped-32x32.gif b/docs/images/fat-jalapeno-pepper-cropped-32x32.gif
similarity index 100%
rename from trunk/docs/images/fat-jalapeno-pepper-cropped-32x32.gif
rename to docs/images/fat-jalapeno-pepper-cropped-32x32.gif
diff --git a/trunk/docs/images/fat-jalapeno-pepper-cropped-48x48.gif b/docs/images/fat-jalapeno-pepper-cropped-48x48.gif
similarity index 100%
rename from trunk/docs/images/fat-jalapeno-pepper-cropped-48x48.gif
rename to docs/images/fat-jalapeno-pepper-cropped-48x48.gif
diff --git a/trunk/docs/images/jalapeno-pepper-16x16.gif b/docs/images/jalapeno-pepper-16x16.gif
similarity index 100%
rename from trunk/docs/images/jalapeno-pepper-16x16.gif
rename to docs/images/jalapeno-pepper-16x16.gif
diff --git a/trunk/docs/images/jalapeno-pepper-16x16.ico b/docs/images/jalapeno-pepper-16x16.ico
similarity index 100%
rename from trunk/docs/images/jalapeno-pepper-16x16.ico
rename to docs/images/jalapeno-pepper-16x16.ico
diff --git a/trunk/docs/images/jalapeno-pepper-32x32.gif b/docs/images/jalapeno-pepper-32x32.gif
similarity index 100%
rename from trunk/docs/images/jalapeno-pepper-32x32.gif
rename to docs/images/jalapeno-pepper-32x32.gif
diff --git a/trunk/docs/images/jalapeno-pepper-32x32.ico b/docs/images/jalapeno-pepper-32x32.ico
similarity index 100%
rename from trunk/docs/images/jalapeno-pepper-32x32.ico
rename to docs/images/jalapeno-pepper-32x32.ico
diff --git a/trunk/docs/images/jalapeno-pepper-57x25.gif b/docs/images/jalapeno-pepper-57x25.gif
similarity index 100%
rename from trunk/docs/images/jalapeno-pepper-57x25.gif
rename to docs/images/jalapeno-pepper-57x25.gif
diff --git a/trunk/docs/images/jalapeno-pepper-combined.ico b/docs/images/jalapeno-pepper-combined.ico
similarity index 100%
rename from trunk/docs/images/jalapeno-pepper-combined.ico
rename to docs/images/jalapeno-pepper-combined.ico
diff --git a/trunk/docs/unity/favicon.ico b/docs/unity/favicon.ico
similarity index 100%
rename from trunk/docs/unity/favicon.ico
rename to docs/unity/favicon.ico
diff --git a/trunk/docs/unity/stylesheets/print.css b/docs/unity/stylesheets/print.css
similarity index 100%
rename from trunk/docs/unity/stylesheets/print.css
rename to docs/unity/stylesheets/print.css
diff --git a/trunk/docs/unity/stylesheets/screen.css b/docs/unity/stylesheets/screen.css
similarity index 100%
rename from trunk/docs/unity/stylesheets/screen.css
rename to docs/unity/stylesheets/screen.css
diff --git a/trunk/docs/unity/unity-html-print.tmpl b/docs/unity/unity-html-print.tmpl
similarity index 100%
rename from trunk/docs/unity/unity-html-print.tmpl
rename to docs/unity/unity-html-print.tmpl
diff --git a/trunk/docs/unity/unity-html-screen.tmpl b/docs/unity/unity-html-screen.tmpl
similarity index 100%
rename from trunk/docs/unity/unity-html-screen.tmpl
rename to docs/unity/unity-html-screen.tmpl
diff --git a/trunk/external/README.txt b/external/README.txt
similarity index 100%
rename from trunk/external/README.txt
rename to external/README.txt
diff --git a/trunk/external/tuningforklib/LICENSE.txt b/external/tuningforklib/LICENSE.txt
similarity index 100%
rename from trunk/external/tuningforklib/LICENSE.txt
rename to external/tuningforklib/LICENSE.txt
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/Chunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/Chunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/Chunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/Chunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeSpaceChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeSpaceChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeSpaceChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/EventTypeSpaceChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedHeaderChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedHeaderChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedHeaderChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedHeaderChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedletChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedletChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedletChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/FeedletChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/PropertyTableChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/PropertyTableChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/PropertyTableChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/PropertyTableChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/RawChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/RawChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/RawChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/RawChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/StringTableChunk.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/StringTableChunk.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/StringTableChunk.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/chunk/StringTableChunk.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventAttribute.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventAttribute.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventAttribute.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventAttribute.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventType.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventType.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventType.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventType.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventTypeSpaceVersion.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventTypeSpaceVersion.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventTypeSpaceVersion.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/EventTypeSpaceVersion.java
diff --git a/trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/ScalarType.java b/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/ScalarType.java
similarity index 100%
rename from trunk/external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/ScalarType.java
rename to external/tuningforklib/src/com/ibm/tuningfork/tracegen/types/ScalarType.java
diff --git a/trunk/include/jni.h b/include/jni.h
similarity index 100%
rename from trunk/include/jni.h
rename to include/jni.h
diff --git a/trunk/libraryInterface/Common/LICENSE.txt b/libraryInterface/Common/LICENSE.txt
similarity index 100%
rename from trunk/libraryInterface/Common/LICENSE.txt
rename to libraryInterface/Common/LICENSE.txt
diff --git a/trunk/libraryInterface/Common/src/java/lang/Class.java b/libraryInterface/Common/src/java/lang/Class.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/Class.java
rename to libraryInterface/Common/src/java/lang/Class.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/Compiler.java b/libraryInterface/Common/src/java/lang/Compiler.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/Compiler.java
rename to libraryInterface/Common/src/java/lang/Compiler.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/Object.java b/libraryInterface/Common/src/java/lang/Object.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/Object.java
rename to libraryInterface/Common/src/java/lang/Object.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/VMCommonLibrarySupport.java b/libraryInterface/Common/src/java/lang/VMCommonLibrarySupport.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/VMCommonLibrarySupport.java
rename to libraryInterface/Common/src/java/lang/VMCommonLibrarySupport.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/ref/JikesRVMSupport.java b/libraryInterface/Common/src/java/lang/ref/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/ref/JikesRVMSupport.java
rename to libraryInterface/Common/src/java/lang/ref/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/ref/PhantomReference.java b/libraryInterface/Common/src/java/lang/ref/PhantomReference.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/ref/PhantomReference.java
rename to libraryInterface/Common/src/java/lang/ref/PhantomReference.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/ref/Reference.java b/libraryInterface/Common/src/java/lang/ref/Reference.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/ref/Reference.java
rename to libraryInterface/Common/src/java/lang/ref/Reference.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/ref/SoftReference.java b/libraryInterface/Common/src/java/lang/ref/SoftReference.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/ref/SoftReference.java
rename to libraryInterface/Common/src/java/lang/ref/SoftReference.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/ref/WeakReference.java b/libraryInterface/Common/src/java/lang/ref/WeakReference.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/ref/WeakReference.java
rename to libraryInterface/Common/src/java/lang/ref/WeakReference.java
diff --git a/trunk/libraryInterface/Common/src/java/lang/reflect/VMCommonLibrarySupport.java b/libraryInterface/Common/src/java/lang/reflect/VMCommonLibrarySupport.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/lang/reflect/VMCommonLibrarySupport.java
rename to libraryInterface/Common/src/java/lang/reflect/VMCommonLibrarySupport.java
diff --git a/trunk/libraryInterface/Common/src/java/net/JikesRVMSupport.java b/libraryInterface/Common/src/java/net/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/java/net/JikesRVMSupport.java
rename to libraryInterface/Common/src/java/net/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/Common/src/sun/misc/Unsafe.java b/libraryInterface/Common/src/sun/misc/Unsafe.java
similarity index 100%
rename from trunk/libraryInterface/Common/src/sun/misc/Unsafe.java
rename to libraryInterface/Common/src/sun/misc/Unsafe.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/LICENSE.txt b/libraryInterface/GNUClasspath/CPL/LICENSE.txt
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/LICENSE.txt
rename to libraryInterface/GNUClasspath/CPL/LICENSE.txt
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/JikesRVMSupport.java b/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/JikesRVMSupport.java
rename to libraryInterface/GNUClasspath/CPL/src/gnu/classpath/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMStackWalker.java b/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMStackWalker.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMStackWalker.java
rename to libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMStackWalker.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMSystemProperties.java b/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMSystemProperties.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMSystemProperties.java
rename to libraryInterface/GNUClasspath/CPL/src/gnu/classpath/VMSystemProperties.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/JikesRVMSupport.java b/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/JikesRVMSupport.java
rename to libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMCPStringBuilder.java b/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMCPStringBuilder.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMCPStringBuilder.java
rename to libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMCPStringBuilder.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMInstrumentationImpl.java b/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMInstrumentationImpl.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMInstrumentationImpl.java
rename to libraryInterface/GNUClasspath/CPL/src/gnu/java/lang/VMInstrumentationImpl.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/io/VMObjectStreamClass.java b/libraryInterface/GNUClasspath/CPL/src/java/io/VMObjectStreamClass.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/io/VMObjectStreamClass.java
rename to libraryInterface/GNUClasspath/CPL/src/java/io/VMObjectStreamClass.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMHelpers.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMHelpers.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMHelpers.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMHelpers.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMSupport.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMSupport.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMClassLoader.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMClassLoader.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMClassLoader.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMClassLoader.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMDouble.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMDouble.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMDouble.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMDouble.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMFloat.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMFloat.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMFloat.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMFloat.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMMath.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMMath.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMMath.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMMath.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMRuntime.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMRuntime.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMRuntime.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMRuntime.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMString.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMString.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMString.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMString.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMSystem.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMSystem.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMSystem.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMSystem.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMThread.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMThread.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMThread.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMThread.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMThrowable.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/VMThrowable.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/VMThrowable.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/VMThrowable.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMHelpers.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMHelpers.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMHelpers.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMHelpers.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMSupport.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMSupport.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMArray.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMArray.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMArray.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMArray.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMConstructor.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMConstructor.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMConstructor.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMConstructor.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMField.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMField.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMField.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMField.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMMethod.java b/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMMethod.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMMethod.java
rename to libraryInterface/GNUClasspath/CPL/src/java/lang/reflect/VMMethod.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/nio/JikesRVMSupport.java b/libraryInterface/GNUClasspath/CPL/src/java/nio/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/nio/JikesRVMSupport.java
rename to libraryInterface/GNUClasspath/CPL/src/java/nio/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/nio/VMDirectByteBuffer.java b/libraryInterface/GNUClasspath/CPL/src/java/nio/VMDirectByteBuffer.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/nio/VMDirectByteBuffer.java
rename to libraryInterface/GNUClasspath/CPL/src/java/nio/VMDirectByteBuffer.java
diff --git a/trunk/libraryInterface/GNUClasspath/CPL/src/java/util/VMTimeZone.java b/libraryInterface/GNUClasspath/CPL/src/java/util/VMTimeZone.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/CPL/src/java/util/VMTimeZone.java
rename to libraryInterface/GNUClasspath/CPL/src/java/util/VMTimeZone.java
diff --git a/trunk/libraryInterface/GNUClasspath/LGPL/LICENSE.txt b/libraryInterface/GNUClasspath/LGPL/LICENSE.txt
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/LGPL/LICENSE.txt
rename to libraryInterface/GNUClasspath/LGPL/LICENSE.txt
diff --git a/trunk/libraryInterface/GNUClasspath/LGPL/src/gnu/java/nio/VMChannel.java b/libraryInterface/GNUClasspath/LGPL/src/gnu/java/nio/VMChannel.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/LGPL/src/gnu/java/nio/VMChannel.java
rename to libraryInterface/GNUClasspath/LGPL/src/gnu/java/nio/VMChannel.java
diff --git a/trunk/libraryInterface/GNUClasspath/LGPL/src/java/security/VMAccessController.java b/libraryInterface/GNUClasspath/LGPL/src/java/security/VMAccessController.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/LGPL/src/java/security/VMAccessController.java
rename to libraryInterface/GNUClasspath/LGPL/src/java/security/VMAccessController.java
diff --git a/trunk/libraryInterface/GNUClasspath/PD/LICENSE.txt b/libraryInterface/GNUClasspath/PD/LICENSE.txt
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/PD/LICENSE.txt
rename to libraryInterface/GNUClasspath/PD/LICENSE.txt
diff --git a/trunk/libraryInterface/GNUClasspath/PD/src/java/util/concurrent/atomic/AtomicLong.java b/libraryInterface/GNUClasspath/PD/src/java/util/concurrent/atomic/AtomicLong.java
similarity index 100%
rename from trunk/libraryInterface/GNUClasspath/PD/src/java/util/concurrent/atomic/AtomicLong.java
rename to libraryInterface/GNUClasspath/PD/src/java/util/concurrent/atomic/AtomicLong.java
diff --git a/trunk/libraryInterface/Harmony/ASF/LICENSE.txt b/libraryInterface/Harmony/ASF/LICENSE.txt
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/LICENSE.txt
rename to libraryInterface/Harmony/ASF/LICENSE.txt
diff --git a/trunk/libraryInterface/Harmony/ASF/native/vmls.c b/libraryInterface/Harmony/ASF/native/vmls.c
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/native/vmls.c
rename to libraryInterface/Harmony/ASF/native/vmls.c
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/ClassLoader.java b/libraryInterface/Harmony/ASF/src/java/lang/ClassLoader.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/ClassLoader.java
rename to libraryInterface/Harmony/ASF/src/java/lang/ClassLoader.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/Package.java b/libraryInterface/Harmony/ASF/src/java/lang/Package.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/Package.java
rename to libraryInterface/Harmony/ASF/src/java/lang/Package.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/Runtime.java b/libraryInterface/Harmony/ASF/src/java/lang/Runtime.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/Runtime.java
rename to libraryInterface/Harmony/ASF/src/java/lang/Runtime.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/String.java b/libraryInterface/Harmony/ASF/src/java/lang/String.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/String.java
rename to libraryInterface/Harmony/ASF/src/java/lang/String.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/System.java b/libraryInterface/Harmony/ASF/src/java/lang/System.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/System.java
rename to libraryInterface/Harmony/ASF/src/java/lang/System.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/Thread.java b/libraryInterface/Harmony/ASF/src/java/lang/Thread.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/Thread.java
rename to libraryInterface/Harmony/ASF/src/java/lang/Thread.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/ThreadGroup.java b/libraryInterface/Harmony/ASF/src/java/lang/ThreadGroup.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/ThreadGroup.java
rename to libraryInterface/Harmony/ASF/src/java/lang/ThreadGroup.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/Throwable.java b/libraryInterface/Harmony/ASF/src/java/lang/Throwable.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/Throwable.java
rename to libraryInterface/Harmony/ASF/src/java/lang/Throwable.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/ref/ReferenceQueue.java b/libraryInterface/Harmony/ASF/src/java/lang/ref/ReferenceQueue.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/ref/ReferenceQueue.java
rename to libraryInterface/Harmony/ASF/src/java/lang/ref/ReferenceQueue.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/AccessibleObject.java b/libraryInterface/Harmony/ASF/src/java/lang/reflect/AccessibleObject.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/AccessibleObject.java
rename to libraryInterface/Harmony/ASF/src/java/lang/reflect/AccessibleObject.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Array.java b/libraryInterface/Harmony/ASF/src/java/lang/reflect/Array.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Array.java
rename to libraryInterface/Harmony/ASF/src/java/lang/reflect/Array.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Constructor.java b/libraryInterface/Harmony/ASF/src/java/lang/reflect/Constructor.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Constructor.java
rename to libraryInterface/Harmony/ASF/src/java/lang/reflect/Constructor.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Field.java b/libraryInterface/Harmony/ASF/src/java/lang/reflect/Field.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Field.java
rename to libraryInterface/Harmony/ASF/src/java/lang/reflect/Field.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Method.java b/libraryInterface/Harmony/ASF/src/java/lang/reflect/Method.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/lang/reflect/Method.java
rename to libraryInterface/Harmony/ASF/src/java/lang/reflect/Method.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/java/security/AccessController.java b/libraryInterface/Harmony/ASF/src/java/security/AccessController.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/java/security/AccessController.java
rename to libraryInterface/Harmony/ASF/src/java/security/AccessController.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/kernel/vm/VM.java b/libraryInterface/Harmony/ASF/src/org/apache/harmony/kernel/vm/VM.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/kernel/vm/VM.java
rename to libraryInterface/Harmony/ASF/src/org/apache/harmony/kernel/vm/VM.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/RuntimePermissionCollection.java b/libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/RuntimePermissionCollection.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/RuntimePermissionCollection.java
rename to libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/RuntimePermissionCollection.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/reflect/ReflectPermissionCollection.java b/libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/reflect/ReflectPermissionCollection.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/reflect/ReflectPermissionCollection.java
rename to libraryInterface/Harmony/ASF/src/org/apache/harmony/lang/reflect/ReflectPermissionCollection.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java b/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java
rename to libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java
diff --git a/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/util/Util.java b/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/util/Util.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/util/Util.java
rename to libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/util/Util.java
diff --git a/trunk/libraryInterface/Harmony/CPL/src/java/lang/JikesRVMHelpers.java b/libraryInterface/Harmony/CPL/src/java/lang/JikesRVMHelpers.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/CPL/src/java/lang/JikesRVMHelpers.java
rename to libraryInterface/Harmony/CPL/src/java/lang/JikesRVMHelpers.java
diff --git a/trunk/libraryInterface/Harmony/CPL/src/java/lang/JikesRVMSupport.java b/libraryInterface/Harmony/CPL/src/java/lang/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/CPL/src/java/lang/JikesRVMSupport.java
rename to libraryInterface/Harmony/CPL/src/java/lang/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/Harmony/CPL/src/java/lang/reflect/JikesRVMSupport.java b/libraryInterface/Harmony/CPL/src/java/lang/reflect/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/CPL/src/java/lang/reflect/JikesRVMSupport.java
rename to libraryInterface/Harmony/CPL/src/java/lang/reflect/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/Harmony/CPL/src/java/nio/JikesRVMSupport.java b/libraryInterface/Harmony/CPL/src/java/nio/JikesRVMSupport.java
similarity index 100%
rename from trunk/libraryInterface/Harmony/CPL/src/java/nio/JikesRVMSupport.java
rename to libraryInterface/Harmony/CPL/src/java/nio/JikesRVMSupport.java
diff --git a/trunk/libraryInterface/README.txt b/libraryInterface/README.txt
similarity index 100%
rename from trunk/libraryInterface/README.txt
rename to libraryInterface/README.txt
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/ArchitectureSpecific.fake b/rvm/src-generated/ia32-assembler-opt/ArchitectureSpecific.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/ArchitectureSpecific.fake
rename to rvm/src-generated/ia32-assembler-opt/ArchitectureSpecific.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/BaselineCompilerImpl.fake b/rvm/src-generated/ia32-assembler-opt/BaselineCompilerImpl.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/BaselineCompilerImpl.fake
rename to rvm/src-generated/ia32-assembler-opt/BaselineCompilerImpl.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/CodeArray.fake b/rvm/src-generated/ia32-assembler-opt/CodeArray.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/CodeArray.fake
rename to rvm/src-generated/ia32-assembler-opt/CodeArray.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java b/rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java
rename to rvm/src-generated/ia32-assembler-opt/GenerateAssembler.java
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/InstructionFormatTables.template b/rvm/src-generated/ia32-assembler-opt/InstructionFormatTables.template
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/InstructionFormatTables.template
rename to rvm/src-generated/ia32-assembler-opt/InstructionFormatTables.template
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/JikesRVMSupport.fake b/rvm/src-generated/ia32-assembler-opt/JikesRVMSupport.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/JikesRVMSupport.fake
rename to rvm/src-generated/ia32-assembler-opt/JikesRVMSupport.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/Lister.fake b/rvm/src-generated/ia32-assembler-opt/Lister.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/Lister.fake
rename to rvm/src-generated/ia32-assembler-opt/Lister.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/MachineCode.fake b/rvm/src-generated/ia32-assembler-opt/MachineCode.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/MachineCode.fake
rename to rvm/src-generated/ia32-assembler-opt/MachineCode.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/Magic.fake b/rvm/src-generated/ia32-assembler-opt/Magic.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/Magic.fake
rename to rvm/src-generated/ia32-assembler-opt/Magic.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/OperatorFormatTable.template b/rvm/src-generated/ia32-assembler-opt/OperatorFormatTable.template
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/OperatorFormatTable.template
rename to rvm/src-generated/ia32-assembler-opt/OperatorFormatTable.template
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/OperatorFormatTables.template b/rvm/src-generated/ia32-assembler-opt/OperatorFormatTables.template
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/OperatorFormatTables.template
rename to rvm/src-generated/ia32-assembler-opt/OperatorFormatTables.template
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/OutOfLineMachineCode.fake b/rvm/src-generated/ia32-assembler-opt/OutOfLineMachineCode.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/OutOfLineMachineCode.fake
rename to rvm/src-generated/ia32-assembler-opt/OutOfLineMachineCode.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/RVMField.fake b/rvm/src-generated/ia32-assembler-opt/RVMField.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/RVMField.fake
rename to rvm/src-generated/ia32-assembler-opt/RVMField.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler-opt/VM.fake b/rvm/src-generated/ia32-assembler-opt/VM.fake
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler-opt/VM.fake
rename to rvm/src-generated/ia32-assembler-opt/VM.fake
diff --git a/trunk/rvm/src-generated/ia32-assembler/Assembler.in b/rvm/src-generated/ia32-assembler/Assembler.in
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler/Assembler.in
rename to rvm/src-generated/ia32-assembler/Assembler.in
diff --git a/trunk/rvm/src-generated/ia32-assembler/genAssembler.sh b/rvm/src-generated/ia32-assembler/genAssembler.sh
similarity index 100%
rename from trunk/rvm/src-generated/ia32-assembler/genAssembler.sh
rename to rvm/src-generated/ia32-assembler/genAssembler.sh
diff --git a/trunk/rvm/src-generated/opt-burs/BURS_TreeNode.template b/rvm/src-generated/opt-burs/BURS_TreeNode.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/BURS_TreeNode.template
rename to rvm/src-generated/opt-burs/BURS_TreeNode.template
diff --git a/trunk/rvm/src-generated/opt-burs/ia32/IA32.rules b/rvm/src-generated/opt-burs/ia32/IA32.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ia32/IA32.rules
rename to rvm/src-generated/opt-burs/ia32/IA32.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ia32/IA32_SSE2.rules b/rvm/src-generated/opt-burs/ia32/IA32_SSE2.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ia32/IA32_SSE2.rules
rename to rvm/src-generated/opt-burs/ia32/IA32_SSE2.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ia32/IA32_x87.rules b/rvm/src-generated/opt-burs/ia32/IA32_x87.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ia32/IA32_x87.rules
rename to rvm/src-generated/opt-burs/ia32/IA32_x87.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ir.template b/rvm/src-generated/opt-burs/ir.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ir.template
rename to rvm/src-generated/opt-burs/ir.template
diff --git a/trunk/rvm/src-generated/opt-burs/jburg/LICENSE.txt b/rvm/src-generated/opt-burs/jburg/LICENSE.txt
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/jburg/LICENSE.txt
rename to rvm/src-generated/opt-burs/jburg/LICENSE.txt
diff --git a/trunk/rvm/src-generated/opt-burs/jburg/burg.template b/rvm/src-generated/opt-burs/jburg/burg.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/jburg/burg.template
rename to rvm/src-generated/opt-burs/jburg/burg.template
diff --git a/trunk/rvm/src-generated/opt-burs/jburg/gram.y b/rvm/src-generated/opt-burs/jburg/gram.y
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/jburg/gram.y
rename to rvm/src-generated/opt-burs/jburg/gram.y
diff --git a/trunk/rvm/src-generated/opt-burs/jburg/jburg.c b/rvm/src-generated/opt-burs/jburg/jburg.c
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/jburg/jburg.c
rename to rvm/src-generated/opt-burs/jburg/jburg.c
diff --git a/trunk/rvm/src-generated/opt-burs/jburg/jburg.h b/rvm/src-generated/opt-burs/jburg/jburg.h
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/jburg/jburg.h
rename to rvm/src-generated/opt-burs/jburg/jburg.h
diff --git a/trunk/rvm/src-generated/opt-burs/ppc/PPC_Alu32.rules b/rvm/src-generated/opt-burs/ppc/PPC_Alu32.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ppc/PPC_Alu32.rules
rename to rvm/src-generated/opt-burs/ppc/PPC_Alu32.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ppc/PPC_Alu64.rules b/rvm/src-generated/opt-burs/ppc/PPC_Alu64.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ppc/PPC_Alu64.rules
rename to rvm/src-generated/opt-burs/ppc/PPC_Alu64.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ppc/PPC_Common.rules b/rvm/src-generated/opt-burs/ppc/PPC_Common.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ppc/PPC_Common.rules
rename to rvm/src-generated/opt-burs/ppc/PPC_Common.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ppc/PPC_Mem32.rules b/rvm/src-generated/opt-burs/ppc/PPC_Mem32.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ppc/PPC_Mem32.rules
rename to rvm/src-generated/opt-burs/ppc/PPC_Mem32.rules
diff --git a/trunk/rvm/src-generated/opt-burs/ppc/PPC_Mem64.rules b/rvm/src-generated/opt-burs/ppc/PPC_Mem64.rules
similarity index 100%
rename from trunk/rvm/src-generated/opt-burs/ppc/PPC_Mem64.rules
rename to rvm/src-generated/opt-burs/ppc/PPC_Mem64.rules
diff --git a/trunk/rvm/src-generated/opt-ir/CommonOperands.dat b/rvm/src-generated/opt-ir/CommonOperands.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/CommonOperands.dat
rename to rvm/src-generated/opt-ir/CommonOperands.dat
diff --git a/trunk/rvm/src-generated/opt-ir/InstructionFormatList.dat b/rvm/src-generated/opt-ir/InstructionFormatList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/InstructionFormatList.dat
rename to rvm/src-generated/opt-ir/InstructionFormatList.dat
diff --git a/trunk/rvm/src-generated/opt-ir/InstructionFormats.template b/rvm/src-generated/opt-ir/InstructionFormats.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/InstructionFormats.template
rename to rvm/src-generated/opt-ir/InstructionFormats.template
diff --git a/trunk/rvm/src-generated/opt-ir/Operator.template b/rvm/src-generated/opt-ir/Operator.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/Operator.template
rename to rvm/src-generated/opt-ir/Operator.template
diff --git a/trunk/rvm/src-generated/opt-ir/OperatorList.dat b/rvm/src-generated/opt-ir/OperatorList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/OperatorList.dat
rename to rvm/src-generated/opt-ir/OperatorList.dat
diff --git a/trunk/rvm/src-generated/opt-ir/OperatorNames.template b/rvm/src-generated/opt-ir/OperatorNames.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/OperatorNames.template
rename to rvm/src-generated/opt-ir/OperatorNames.template
diff --git a/trunk/rvm/src-generated/opt-ir/Operators.template b/rvm/src-generated/opt-ir/Operators.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/Operators.template
rename to rvm/src-generated/opt-ir/Operators.template
diff --git a/trunk/rvm/src-generated/opt-ir/ia32/InstructionFormatList.dat b/rvm/src-generated/opt-ir/ia32/InstructionFormatList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ia32/InstructionFormatList.dat
rename to rvm/src-generated/opt-ir/ia32/InstructionFormatList.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ia32/OperatorList.dat b/rvm/src-generated/opt-ir/ia32/OperatorList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ia32/OperatorList.dat
rename to rvm/src-generated/opt-ir/ia32/OperatorList.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ppc/InstructionFormatList.dat b/rvm/src-generated/opt-ir/ppc/InstructionFormatList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ppc/InstructionFormatList.dat
rename to rvm/src-generated/opt-ir/ppc/InstructionFormatList.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Alu32.dat b/rvm/src-generated/opt-ir/ppc/OperatorList_Alu32.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Alu32.dat
rename to rvm/src-generated/opt-ir/ppc/OperatorList_Alu32.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Alu64.dat b/rvm/src-generated/opt-ir/ppc/OperatorList_Alu64.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Alu64.dat
rename to rvm/src-generated/opt-ir/ppc/OperatorList_Alu64.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Common.dat b/rvm/src-generated/opt-ir/ppc/OperatorList_Common.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Common.dat
rename to rvm/src-generated/opt-ir/ppc/OperatorList_Common.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Mem32.dat b/rvm/src-generated/opt-ir/ppc/OperatorList_Mem32.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Mem32.dat
rename to rvm/src-generated/opt-ir/ppc/OperatorList_Mem32.dat
diff --git a/trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Mem64.dat b/rvm/src-generated/opt-ir/ppc/OperatorList_Mem64.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/ppc/OperatorList_Mem64.dat
rename to rvm/src-generated/opt-ir/ppc/OperatorList_Mem64.dat
diff --git a/trunk/rvm/src-generated/opt-ir/splitInstructionFormats.perl b/rvm/src-generated/opt-ir/splitInstructionFormats.perl
similarity index 100%
rename from trunk/rvm/src-generated/opt-ir/splitInstructionFormats.perl
rename to rvm/src-generated/opt-ir/splitInstructionFormats.perl
diff --git a/trunk/rvm/src-generated/opt-scheduler/OperatorClass.template b/rvm/src-generated/opt-scheduler/OperatorClass.template
similarity index 100%
rename from trunk/rvm/src-generated/opt-scheduler/OperatorClass.template
rename to rvm/src-generated/opt-scheduler/OperatorClass.template
diff --git a/trunk/rvm/src-generated/opt-scheduler/ia32/OperatorClassList.dat b/rvm/src-generated/opt-scheduler/ia32/OperatorClassList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-scheduler/ia32/OperatorClassList.dat
rename to rvm/src-generated/opt-scheduler/ia32/OperatorClassList.dat
diff --git a/trunk/rvm/src-generated/opt-scheduler/ia32/ResourceList.dat b/rvm/src-generated/opt-scheduler/ia32/ResourceList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-scheduler/ia32/ResourceList.dat
rename to rvm/src-generated/opt-scheduler/ia32/ResourceList.dat
diff --git a/trunk/rvm/src-generated/opt-scheduler/ppc/OperatorClassList.dat b/rvm/src-generated/opt-scheduler/ppc/OperatorClassList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-scheduler/ppc/OperatorClassList.dat
rename to rvm/src-generated/opt-scheduler/ppc/OperatorClassList.dat
diff --git a/trunk/rvm/src-generated/opt-scheduler/ppc/ResourceList.dat b/rvm/src-generated/opt-scheduler/ppc/ResourceList.dat
similarity index 100%
rename from trunk/rvm/src-generated/opt-scheduler/ppc/ResourceList.dat
rename to rvm/src-generated/opt-scheduler/ppc/ResourceList.dat
diff --git a/trunk/rvm/src-generated/options/AOSOptions.template b/rvm/src-generated/options/AOSOptions.template
similarity index 100%
rename from trunk/rvm/src-generated/options/AOSOptions.template
rename to rvm/src-generated/options/AOSOptions.template
diff --git a/trunk/rvm/src-generated/options/BaselineOptions.template b/rvm/src-generated/options/BaselineOptions.template
similarity index 100%
rename from trunk/rvm/src-generated/options/BaselineOptions.template
rename to rvm/src-generated/options/BaselineOptions.template
diff --git a/trunk/rvm/src-generated/options/BooleanOptions.aos.dat b/rvm/src-generated/options/BooleanOptions.aos.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/BooleanOptions.aos.dat
rename to rvm/src-generated/options/BooleanOptions.aos.dat
diff --git a/trunk/rvm/src-generated/options/BooleanOptions.baseline.dat b/rvm/src-generated/options/BooleanOptions.baseline.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/BooleanOptions.baseline.dat
rename to rvm/src-generated/options/BooleanOptions.baseline.dat
diff --git a/trunk/rvm/src-generated/options/BooleanOptions.opt.dat b/rvm/src-generated/options/BooleanOptions.opt.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/BooleanOptions.opt.dat
rename to rvm/src-generated/options/BooleanOptions.opt.dat
diff --git a/trunk/rvm/src-generated/options/BooleanOptions.vm.dat b/rvm/src-generated/options/BooleanOptions.vm.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/BooleanOptions.vm.dat
rename to rvm/src-generated/options/BooleanOptions.vm.dat
diff --git a/trunk/rvm/src-generated/options/MasterOptions.template b/rvm/src-generated/options/MasterOptions.template
similarity index 100%
rename from trunk/rvm/src-generated/options/MasterOptions.template
rename to rvm/src-generated/options/MasterOptions.template
diff --git a/trunk/rvm/src-generated/options/OptOptions.template b/rvm/src-generated/options/OptOptions.template
similarity index 100%
rename from trunk/rvm/src-generated/options/OptOptions.template
rename to rvm/src-generated/options/OptOptions.template
diff --git a/trunk/rvm/src-generated/options/Options.template b/rvm/src-generated/options/Options.template
similarity index 100%
rename from trunk/rvm/src-generated/options/Options.template
rename to rvm/src-generated/options/Options.template
diff --git a/trunk/rvm/src-generated/options/SharedBooleanOptions.dat b/rvm/src-generated/options/SharedBooleanOptions.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/SharedBooleanOptions.dat
rename to rvm/src-generated/options/SharedBooleanOptions.dat
diff --git a/trunk/rvm/src-generated/options/SharedValueOptions.dat b/rvm/src-generated/options/SharedValueOptions.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/SharedValueOptions.dat
rename to rvm/src-generated/options/SharedValueOptions.dat
diff --git a/trunk/rvm/src-generated/options/ValueOptions.aos.dat b/rvm/src-generated/options/ValueOptions.aos.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/ValueOptions.aos.dat
rename to rvm/src-generated/options/ValueOptions.aos.dat
diff --git a/trunk/rvm/src-generated/options/ValueOptions.baseline.dat b/rvm/src-generated/options/ValueOptions.baseline.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/ValueOptions.baseline.dat
rename to rvm/src-generated/options/ValueOptions.baseline.dat
diff --git a/trunk/rvm/src-generated/options/ValueOptions.opt.dat b/rvm/src-generated/options/ValueOptions.opt.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/ValueOptions.opt.dat
rename to rvm/src-generated/options/ValueOptions.opt.dat
diff --git a/trunk/rvm/src-generated/options/ValueOptions.vm.dat b/rvm/src-generated/options/ValueOptions.vm.dat
similarity index 100%
rename from trunk/rvm/src-generated/options/ValueOptions.vm.dat
rename to rvm/src-generated/options/ValueOptions.vm.dat
diff --git a/trunk/rvm/src-generated/vm-configuration/ArchitectureSpecific.template b/rvm/src-generated/vm-configuration/ArchitectureSpecific.template
similarity index 100%
rename from trunk/rvm/src-generated/vm-configuration/ArchitectureSpecific.template
rename to rvm/src-generated/vm-configuration/ArchitectureSpecific.template
diff --git a/trunk/rvm/src-generated/vm-configuration/ArchitectureSpecificOpt.template b/rvm/src-generated/vm-configuration/ArchitectureSpecificOpt.template
similarity index 100%
rename from trunk/rvm/src-generated/vm-configuration/ArchitectureSpecificOpt.template
rename to rvm/src-generated/vm-configuration/ArchitectureSpecificOpt.template
diff --git a/trunk/rvm/src-generated/vm-configuration/Configuration.template b/rvm/src-generated/vm-configuration/Configuration.template
similarity index 100%
rename from trunk/rvm/src-generated/vm-configuration/Configuration.template
rename to rvm/src-generated/vm-configuration/Configuration.template
diff --git a/trunk/rvm/src-generated/vm-configuration/HeapLayoutConstants.template b/rvm/src-generated/vm-configuration/HeapLayoutConstants.template
similarity index 100%
rename from trunk/rvm/src-generated/vm-configuration/HeapLayoutConstants.template
rename to rvm/src-generated/vm-configuration/HeapLayoutConstants.template
diff --git a/trunk/rvm/src-generated/vm-configuration/Selected.template b/rvm/src-generated/vm-configuration/Selected.template
similarity index 100%
rename from trunk/rvm/src-generated/vm-configuration/Selected.template
rename to rvm/src-generated/vm-configuration/Selected.template
diff --git a/trunk/rvm/src/Dummy.java b/rvm/src/Dummy.java
similarity index 100%
rename from trunk/rvm/src/Dummy.java
rename to rvm/src/Dummy.java
diff --git a/trunk/rvm/src/OptDummy.java b/rvm/src/OptDummy.java
similarity index 100%
rename from trunk/rvm/src/OptDummy.java
rename to rvm/src/OptDummy.java
diff --git a/trunk/rvm/src/org/jikesrvm/Callbacks.java b/rvm/src/org/jikesrvm/Callbacks.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/Callbacks.java
rename to rvm/src/org/jikesrvm/Callbacks.java
diff --git a/trunk/rvm/src/org/jikesrvm/CommandLineArgs.java b/rvm/src/org/jikesrvm/CommandLineArgs.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/CommandLineArgs.java
rename to rvm/src/org/jikesrvm/CommandLineArgs.java
diff --git a/trunk/rvm/src/org/jikesrvm/Constants.java b/rvm/src/org/jikesrvm/Constants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/Constants.java
rename to rvm/src/org/jikesrvm/Constants.java
diff --git a/trunk/rvm/src/org/jikesrvm/MachineSpecific.java b/rvm/src/org/jikesrvm/MachineSpecific.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/MachineSpecific.java
rename to rvm/src/org/jikesrvm/MachineSpecific.java
diff --git a/trunk/rvm/src/org/jikesrvm/PrintContainer.java b/rvm/src/org/jikesrvm/PrintContainer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/PrintContainer.java
rename to rvm/src/org/jikesrvm/PrintContainer.java
diff --git a/trunk/rvm/src/org/jikesrvm/PrintLN.java b/rvm/src/org/jikesrvm/PrintLN.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/PrintLN.java
rename to rvm/src/org/jikesrvm/PrintLN.java
diff --git a/trunk/rvm/src/org/jikesrvm/Properties.java b/rvm/src/org/jikesrvm/Properties.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/Properties.java
rename to rvm/src/org/jikesrvm/Properties.java
diff --git a/trunk/rvm/src/org/jikesrvm/Services.java b/rvm/src/org/jikesrvm/Services.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/Services.java
rename to rvm/src/org/jikesrvm/Services.java
diff --git a/trunk/rvm/src/org/jikesrvm/SizeConstants.java b/rvm/src/org/jikesrvm/SizeConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/SizeConstants.java
rename to rvm/src/org/jikesrvm/SizeConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/UnimplementedError.java b/rvm/src/org/jikesrvm/UnimplementedError.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/UnimplementedError.java
rename to rvm/src/org/jikesrvm/UnimplementedError.java
diff --git a/trunk/rvm/src/org/jikesrvm/VM.java b/rvm/src/org/jikesrvm/VM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/VM.java
rename to rvm/src/org/jikesrvm/VM.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/AosEntrypoints.java b/rvm/src/org/jikesrvm/adaptive/AosEntrypoints.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/AosEntrypoints.java
rename to rvm/src/org/jikesrvm/adaptive/AosEntrypoints.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/OSRListener.java b/rvm/src/org/jikesrvm/adaptive/OSRListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/OSRListener.java
rename to rvm/src/org/jikesrvm/adaptive/OSRListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java b/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java
rename to rvm/src/org/jikesrvm/adaptive/OSROrganizerThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java b/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java
rename to rvm/src/org/jikesrvm/adaptive/OnStackReplacementEvent.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/OnStackReplacementPlan.java b/rvm/src/org/jikesrvm/adaptive/OnStackReplacementPlan.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/OnStackReplacementPlan.java
rename to rvm/src/org/jikesrvm/adaptive/OnStackReplacementPlan.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java b/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java
rename to rvm/src/org/jikesrvm/adaptive/OnStackReplacementTrigger.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/AINewHotEdgeEvent.java b/rvm/src/org/jikesrvm/adaptive/controller/AINewHotEdgeEvent.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/AINewHotEdgeEvent.java
rename to rvm/src/org/jikesrvm/adaptive/controller/AINewHotEdgeEvent.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/AdaptiveInlining.java b/rvm/src/org/jikesrvm/adaptive/controller/AdaptiveInlining.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/AdaptiveInlining.java
rename to rvm/src/org/jikesrvm/adaptive/controller/AdaptiveInlining.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/AnalyticModel.java b/rvm/src/org/jikesrvm/adaptive/controller/AnalyticModel.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/AnalyticModel.java
rename to rvm/src/org/jikesrvm/adaptive/controller/AnalyticModel.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/Controller.java b/rvm/src/org/jikesrvm/adaptive/controller/Controller.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/Controller.java
rename to rvm/src/org/jikesrvm/adaptive/controller/Controller.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerInputEvent.java b/rvm/src/org/jikesrvm/adaptive/controller/ControllerInputEvent.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerInputEvent.java
rename to rvm/src/org/jikesrvm/adaptive/controller/ControllerInputEvent.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerMemory.java b/rvm/src/org/jikesrvm/adaptive/controller/ControllerMemory.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerMemory.java
rename to rvm/src/org/jikesrvm/adaptive/controller/ControllerMemory.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerPlan.java b/rvm/src/org/jikesrvm/adaptive/controller/ControllerPlan.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerPlan.java
rename to rvm/src/org/jikesrvm/adaptive/controller/ControllerPlan.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerThread.java b/rvm/src/org/jikesrvm/adaptive/controller/ControllerThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/ControllerThread.java
rename to rvm/src/org/jikesrvm/adaptive/controller/ControllerThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/HotMethodEvent.java b/rvm/src/org/jikesrvm/adaptive/controller/HotMethodEvent.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/HotMethodEvent.java
rename to rvm/src/org/jikesrvm/adaptive/controller/HotMethodEvent.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/HotMethodRecompilationEvent.java b/rvm/src/org/jikesrvm/adaptive/controller/HotMethodRecompilationEvent.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/HotMethodRecompilationEvent.java
rename to rvm/src/org/jikesrvm/adaptive/controller/HotMethodRecompilationEvent.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/MultiLevelAdaptiveModel.java b/rvm/src/org/jikesrvm/adaptive/controller/MultiLevelAdaptiveModel.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/MultiLevelAdaptiveModel.java
rename to rvm/src/org/jikesrvm/adaptive/controller/MultiLevelAdaptiveModel.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/RecompilationChoice.java b/rvm/src/org/jikesrvm/adaptive/controller/RecompilationChoice.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/RecompilationChoice.java
rename to rvm/src/org/jikesrvm/adaptive/controller/RecompilationChoice.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java b/rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java
rename to rvm/src/org/jikesrvm/adaptive/controller/RecompilationStrategy.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/controller/RecompileOptChoice.java b/rvm/src/org/jikesrvm/adaptive/controller/RecompileOptChoice.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/controller/RecompileOptChoice.java
rename to rvm/src/org/jikesrvm/adaptive/controller/RecompileOptChoice.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/database/AOSDatabase.java b/rvm/src/org/jikesrvm/adaptive/database/AOSDatabase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/database/AOSDatabase.java
rename to rvm/src/org/jikesrvm/adaptive/database/AOSDatabase.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/database/callgraph/CallSite.java b/rvm/src/org/jikesrvm/adaptive/database/callgraph/CallSite.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/database/callgraph/CallSite.java
rename to rvm/src/org/jikesrvm/adaptive/database/callgraph/CallSite.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/database/callgraph/PartialCallGraph.java b/rvm/src/org/jikesrvm/adaptive/database/callgraph/PartialCallGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/database/callgraph/PartialCallGraph.java
rename to rvm/src/org/jikesrvm/adaptive/database/callgraph/PartialCallGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/database/callgraph/WeightedCallTargets.java b/rvm/src/org/jikesrvm/adaptive/database/callgraph/WeightedCallTargets.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/database/callgraph/WeightedCallTargets.java
rename to rvm/src/org/jikesrvm/adaptive/database/callgraph/WeightedCallTargets.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java b/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java
rename to rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountData.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountSet.java b/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountSet.java
rename to rvm/src/org/jikesrvm/adaptive/database/methodsamples/MethodCountSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/Decayable.java b/rvm/src/org/jikesrvm/adaptive/measurements/Decayable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/Decayable.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/Decayable.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/Reportable.java b/rvm/src/org/jikesrvm/adaptive/measurements/Reportable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/Reportable.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/Reportable.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/RuntimeMeasurements.java b/rvm/src/org/jikesrvm/adaptive/measurements/RuntimeMeasurements.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/RuntimeMeasurements.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/RuntimeMeasurements.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterArrayManager.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterArrayManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterArrayManager.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterArrayManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterNameFunction.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterNameFunction.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterNameFunction.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterNameFunction.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/Instrumentation.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/Instrumentation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/Instrumentation.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/Instrumentation.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/ManagedCounterData.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodInvocationCounterData.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodNameFunction.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodNameFunction.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodNameFunction.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/MethodNameFunction.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/StringEventCounterData.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/StringEventCounterData.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/StringEventCounterData.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/StringEventCounterData.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/YieldpointCounterData.java b/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/YieldpointCounterData.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/YieldpointCounterData.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/YieldpointCounterData.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/CallDensityListener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/CallDensityListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/CallDensityListener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/CallDensityListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/ContextListener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/ContextListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/ContextListener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/ContextListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/EdgeListener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/EdgeListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/EdgeListener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/EdgeListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/Listener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/Listener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/Listener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/Listener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/MethodListener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/MethodListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/MethodListener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/MethodListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/NullListener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/NullListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/NullListener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/NullListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/YieldCounterListener.java b/rvm/src/org/jikesrvm/adaptive/measurements/listeners/YieldCounterListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/listeners/YieldCounterListener.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/listeners/YieldCounterListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/organizers/AccumulatingMethodSampleOrganizer.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DecayOrganizer.java b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DecayOrganizer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DecayOrganizer.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/organizers/DecayOrganizer.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/organizers/DynamicCallGraphOrganizer.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/organizers/MethodSampleOrganizer.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/Organizer.java b/rvm/src/org/jikesrvm/adaptive/measurements/organizers/Organizer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/measurements/organizers/Organizer.java
rename to rvm/src/org/jikesrvm/adaptive/measurements/organizers/Organizer.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java b/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/CompilationThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java b/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/CompilerDNA.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/InvocationCounts.java b/rvm/src/org/jikesrvm/adaptive/recompilation/InvocationCounts.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/InvocationCounts.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/InvocationCounts.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java b/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/PreCompile.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/AOSInstrumentationPlan.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/AOSInstrumentationPlan.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/AOSInstrumentationPlan.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/AOSInstrumentationPlan.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/CounterBasedSampling.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/CounterBasedSampling.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/CounterBasedSampling.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/CounterBasedSampling.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertInstructionCounters.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertInstructionCounters.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertInstructionCounters.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertInstructionCounters.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertMethodInvocationCounter.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertMethodInvocationCounter.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertMethodInvocationCounter.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertMethodInvocationCounter.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertYieldpointCounters.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertYieldpointCounters.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertYieldpointCounters.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InsertYieldpointCounters.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/InstrumentationSamplingFramework.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/LowerInstrumentation.java b/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/LowerInstrumentation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/LowerInstrumentation.java
rename to rvm/src/org/jikesrvm/adaptive/recompilation/instrumentation/LowerInstrumentation.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/AOSGenerator.java b/rvm/src/org/jikesrvm/adaptive/util/AOSGenerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/AOSGenerator.java
rename to rvm/src/org/jikesrvm/adaptive/util/AOSGenerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/AOSLogging.java b/rvm/src/org/jikesrvm/adaptive/util/AOSLogging.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/AOSLogging.java
rename to rvm/src/org/jikesrvm/adaptive/util/AOSLogging.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/AOSOptions.java b/rvm/src/org/jikesrvm/adaptive/util/AOSOptions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/AOSOptions.java
rename to rvm/src/org/jikesrvm/adaptive/util/AOSOptions.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/BlockingPriorityQueue.java b/rvm/src/org/jikesrvm/adaptive/util/BlockingPriorityQueue.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/BlockingPriorityQueue.java
rename to rvm/src/org/jikesrvm/adaptive/util/BlockingPriorityQueue.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/CompilerAdvice.java b/rvm/src/org/jikesrvm/adaptive/util/CompilerAdvice.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/CompilerAdvice.java
rename to rvm/src/org/jikesrvm/adaptive/util/CompilerAdvice.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceAttribute.java b/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceAttribute.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceAttribute.java
rename to rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceAttribute.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceInfoReader.java b/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceInfoReader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceInfoReader.java
rename to rvm/src/org/jikesrvm/adaptive/util/CompilerAdviceInfoReader.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/DynamicCallFileInfoReader.java b/rvm/src/org/jikesrvm/adaptive/util/DynamicCallFileInfoReader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/DynamicCallFileInfoReader.java
rename to rvm/src/org/jikesrvm/adaptive/util/DynamicCallFileInfoReader.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/UnResolvedCallSite.java b/rvm/src/org/jikesrvm/adaptive/util/UnResolvedCallSite.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/UnResolvedCallSite.java
rename to rvm/src/org/jikesrvm/adaptive/util/UnResolvedCallSite.java
diff --git a/trunk/rvm/src/org/jikesrvm/adaptive/util/UnResolvedWeightedCallTargets.java b/rvm/src/org/jikesrvm/adaptive/util/UnResolvedWeightedCallTargets.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/adaptive/util/UnResolvedWeightedCallTargets.java
rename to rvm/src/org/jikesrvm/adaptive/util/UnResolvedWeightedCallTargets.java
diff --git a/trunk/rvm/src/org/jikesrvm/apt/annotations/GenerateImplementation.java b/rvm/src/org/jikesrvm/apt/annotations/GenerateImplementation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/apt/annotations/GenerateImplementation.java
rename to rvm/src/org/jikesrvm/apt/annotations/GenerateImplementation.java
diff --git a/trunk/rvm/src/org/jikesrvm/apt/annotations/SysCallTemplate.java b/rvm/src/org/jikesrvm/apt/annotations/SysCallTemplate.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/apt/annotations/SysCallTemplate.java
rename to rvm/src/org/jikesrvm/apt/annotations/SysCallTemplate.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/AbstractMethod.java b/rvm/src/org/jikesrvm/classloader/AbstractMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/AbstractMethod.java
rename to rvm/src/org/jikesrvm/classloader/AbstractMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/AnnotatedElement.java b/rvm/src/org/jikesrvm/classloader/AnnotatedElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/AnnotatedElement.java
rename to rvm/src/org/jikesrvm/classloader/AnnotatedElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/ApplicationClassLoader.java b/rvm/src/org/jikesrvm/classloader/ApplicationClassLoader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/ApplicationClassLoader.java
rename to rvm/src/org/jikesrvm/classloader/ApplicationClassLoader.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/Atom.java b/rvm/src/org/jikesrvm/classloader/Atom.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/Atom.java
rename to rvm/src/org/jikesrvm/classloader/Atom.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java b/rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java
rename to rvm/src/org/jikesrvm/classloader/BootImageMemberLookupError.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/BootstrapClassLoader.java b/rvm/src/org/jikesrvm/classloader/BootstrapClassLoader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/BootstrapClassLoader.java
rename to rvm/src/org/jikesrvm/classloader/BootstrapClassLoader.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/BytecodeConstants.java b/rvm/src/org/jikesrvm/classloader/BytecodeConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/BytecodeConstants.java
rename to rvm/src/org/jikesrvm/classloader/BytecodeConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/BytecodeStream.java b/rvm/src/org/jikesrvm/classloader/BytecodeStream.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/BytecodeStream.java
rename to rvm/src/org/jikesrvm/classloader/BytecodeStream.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/ClassFileReader.java b/rvm/src/org/jikesrvm/classloader/ClassFileReader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/ClassFileReader.java
rename to rvm/src/org/jikesrvm/classloader/ClassFileReader.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/ClassLoaderConstants.java b/rvm/src/org/jikesrvm/classloader/ClassLoaderConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/ClassLoaderConstants.java
rename to rvm/src/org/jikesrvm/classloader/ClassLoaderConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/ClassLoadingListener.java b/rvm/src/org/jikesrvm/classloader/ClassLoadingListener.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/ClassLoadingListener.java
rename to rvm/src/org/jikesrvm/classloader/ClassLoadingListener.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/DynamicTypeCheck.java b/rvm/src/org/jikesrvm/classloader/DynamicTypeCheck.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/DynamicTypeCheck.java
rename to rvm/src/org/jikesrvm/classloader/DynamicTypeCheck.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/ExceptionHandlerMap.java b/rvm/src/org/jikesrvm/classloader/ExceptionHandlerMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/ExceptionHandlerMap.java
rename to rvm/src/org/jikesrvm/classloader/ExceptionHandlerMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/FieldReference.java b/rvm/src/org/jikesrvm/classloader/FieldReference.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/FieldReference.java
rename to rvm/src/org/jikesrvm/classloader/FieldReference.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/FieldVector.java b/rvm/src/org/jikesrvm/classloader/FieldVector.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/FieldVector.java
rename to rvm/src/org/jikesrvm/classloader/FieldVector.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/InterfaceInvocation.java b/rvm/src/org/jikesrvm/classloader/InterfaceInvocation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/InterfaceInvocation.java
rename to rvm/src/org/jikesrvm/classloader/InterfaceInvocation.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/InterfaceMethodSignature.java b/rvm/src/org/jikesrvm/classloader/InterfaceMethodSignature.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/InterfaceMethodSignature.java
rename to rvm/src/org/jikesrvm/classloader/InterfaceMethodSignature.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/LocalVariableTable.java b/rvm/src/org/jikesrvm/classloader/LocalVariableTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/LocalVariableTable.java
rename to rvm/src/org/jikesrvm/classloader/LocalVariableTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/MemberReference.java b/rvm/src/org/jikesrvm/classloader/MemberReference.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/MemberReference.java
rename to rvm/src/org/jikesrvm/classloader/MemberReference.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/MethodReference.java b/rvm/src/org/jikesrvm/classloader/MethodReference.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/MethodReference.java
rename to rvm/src/org/jikesrvm/classloader/MethodReference.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/MethodVector.java b/rvm/src/org/jikesrvm/classloader/MethodVector.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/MethodVector.java
rename to rvm/src/org/jikesrvm/classloader/MethodVector.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/NativeMethod.java b/rvm/src/org/jikesrvm/classloader/NativeMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/NativeMethod.java
rename to rvm/src/org/jikesrvm/classloader/NativeMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/NormalMethod.java b/rvm/src/org/jikesrvm/classloader/NormalMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/NormalMethod.java
rename to rvm/src/org/jikesrvm/classloader/NormalMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/Primitive.java b/rvm/src/org/jikesrvm/classloader/Primitive.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/Primitive.java
rename to rvm/src/org/jikesrvm/classloader/Primitive.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMAnnotation.java b/rvm/src/org/jikesrvm/classloader/RVMAnnotation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMAnnotation.java
rename to rvm/src/org/jikesrvm/classloader/RVMAnnotation.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java b/rvm/src/org/jikesrvm/classloader/RVMArray.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMArray.java
rename to rvm/src/org/jikesrvm/classloader/RVMArray.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMClass.java b/rvm/src/org/jikesrvm/classloader/RVMClass.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMClass.java
rename to rvm/src/org/jikesrvm/classloader/RVMClass.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMClassLoader.java b/rvm/src/org/jikesrvm/classloader/RVMClassLoader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMClassLoader.java
rename to rvm/src/org/jikesrvm/classloader/RVMClassLoader.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMField.java b/rvm/src/org/jikesrvm/classloader/RVMField.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMField.java
rename to rvm/src/org/jikesrvm/classloader/RVMField.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMMember.java b/rvm/src/org/jikesrvm/classloader/RVMMember.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMMember.java
rename to rvm/src/org/jikesrvm/classloader/RVMMember.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMMethod.java b/rvm/src/org/jikesrvm/classloader/RVMMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMMethod.java
rename to rvm/src/org/jikesrvm/classloader/RVMMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/RVMType.java b/rvm/src/org/jikesrvm/classloader/RVMType.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/RVMType.java
rename to rvm/src/org/jikesrvm/classloader/RVMType.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/SpecializedMethod.java b/rvm/src/org/jikesrvm/classloader/SpecializedMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/SpecializedMethod.java
rename to rvm/src/org/jikesrvm/classloader/SpecializedMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/SpecializedMethodManager.java b/rvm/src/org/jikesrvm/classloader/SpecializedMethodManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/SpecializedMethodManager.java
rename to rvm/src/org/jikesrvm/classloader/SpecializedMethodManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/TableBasedDynamicLinker.java b/rvm/src/org/jikesrvm/classloader/TableBasedDynamicLinker.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/TableBasedDynamicLinker.java
rename to rvm/src/org/jikesrvm/classloader/TableBasedDynamicLinker.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/TypeDescriptorParsing.java b/rvm/src/org/jikesrvm/classloader/TypeDescriptorParsing.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/TypeDescriptorParsing.java
rename to rvm/src/org/jikesrvm/classloader/TypeDescriptorParsing.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/TypeReference.java b/rvm/src/org/jikesrvm/classloader/TypeReference.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/TypeReference.java
rename to rvm/src/org/jikesrvm/classloader/TypeReference.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/TypeReferenceVector.java b/rvm/src/org/jikesrvm/classloader/TypeReferenceVector.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/TypeReferenceVector.java
rename to rvm/src/org/jikesrvm/classloader/TypeReferenceVector.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/UTF8Convert.java b/rvm/src/org/jikesrvm/classloader/UTF8Convert.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/UTF8Convert.java
rename to rvm/src/org/jikesrvm/classloader/UTF8Convert.java
diff --git a/trunk/rvm/src/org/jikesrvm/classloader/UnboxedType.java b/rvm/src/org/jikesrvm/classloader/UnboxedType.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/classloader/UnboxedType.java
rename to rvm/src/org/jikesrvm/classloader/UnboxedType.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BBConstants.java b/rvm/src/org/jikesrvm/compilers/baseline/BBConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BBConstants.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BBConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineBootImageCompiler.java b/rvm/src/org/jikesrvm/compilers/baseline/BaselineBootImageCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineBootImageCompiler.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BaselineBootImageCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiledMethod.java b/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiledMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiledMethod.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiledMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java b/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineExceptionTable.java b/rvm/src/org/jikesrvm/compilers/baseline/BaselineExceptionTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BaselineExceptionTable.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BaselineExceptionTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BasicBlock.java b/rvm/src/org/jikesrvm/compilers/baseline/BasicBlock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BasicBlock.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BasicBlock.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BasicBlockFactory.java b/rvm/src/org/jikesrvm/compilers/baseline/BasicBlockFactory.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BasicBlockFactory.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BasicBlockFactory.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BranchProfile.java b/rvm/src/org/jikesrvm/compilers/baseline/BranchProfile.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BranchProfile.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BranchProfile.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java b/rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BranchProfiles.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BuildBB.java b/rvm/src/org/jikesrvm/compilers/baseline/BuildBB.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BuildBB.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BuildBB.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/BuildReferenceMaps.java b/rvm/src/org/jikesrvm/compilers/baseline/BuildReferenceMaps.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/BuildReferenceMaps.java
rename to rvm/src/org/jikesrvm/compilers/baseline/BuildReferenceMaps.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ConditionalBranchProfile.java b/rvm/src/org/jikesrvm/compilers/baseline/ConditionalBranchProfile.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ConditionalBranchProfile.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ConditionalBranchProfile.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/EdgeCounts.java b/rvm/src/org/jikesrvm/compilers/baseline/EdgeCounts.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/EdgeCounts.java
rename to rvm/src/org/jikesrvm/compilers/baseline/EdgeCounts.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/JSRInfo.java b/rvm/src/org/jikesrvm/compilers/baseline/JSRInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/JSRInfo.java
rename to rvm/src/org/jikesrvm/compilers/baseline/JSRInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/JSRSubroutineInfo.java b/rvm/src/org/jikesrvm/compilers/baseline/JSRSubroutineInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/JSRSubroutineInfo.java
rename to rvm/src/org/jikesrvm/compilers/baseline/JSRSubroutineInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/PendingRETInfo.java b/rvm/src/org/jikesrvm/compilers/baseline/PendingRETInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/PendingRETInfo.java
rename to rvm/src/org/jikesrvm/compilers/baseline/PendingRETInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ReferenceMaps.java b/rvm/src/org/jikesrvm/compilers/baseline/ReferenceMaps.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ReferenceMaps.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ReferenceMaps.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/SwitchBranchProfile.java b/rvm/src/org/jikesrvm/compilers/baseline/SwitchBranchProfile.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/SwitchBranchProfile.java
rename to rvm/src/org/jikesrvm/compilers/baseline/SwitchBranchProfile.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java b/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
rename to rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/UnusualMaps.java b/rvm/src/org/jikesrvm/compilers/baseline/UnusualMaps.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/UnusualMaps.java
rename to rvm/src/org/jikesrvm/compilers/baseline/UnusualMaps.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java b/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java b/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineExceptionDeliverer.java b/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineExceptionDeliverer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineExceptionDeliverer.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineExceptionDeliverer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineGCMapIterator.java b/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineGCMapIterator.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java b/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineMagic.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java b/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java b/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineExceptionDeliverer.java b/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineExceptionDeliverer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineExceptionDeliverer.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineExceptionDeliverer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineGCMapIterator.java b/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineGCMapIterator.java
rename to rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/BootImageCompiler.java b/rvm/src/org/jikesrvm/compilers/common/BootImageCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/BootImageCompiler.java
rename to rvm/src/org/jikesrvm/compilers/common/BootImageCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java b/rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java
rename to rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java b/rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java
rename to rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/ExceptionTable.java b/rvm/src/org/jikesrvm/compilers/common/ExceptionTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/ExceptionTable.java
rename to rvm/src/org/jikesrvm/compilers/common/ExceptionTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/HardwareTrapCompiledMethod.java b/rvm/src/org/jikesrvm/compilers/common/HardwareTrapCompiledMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/HardwareTrapCompiledMethod.java
rename to rvm/src/org/jikesrvm/compilers/common/HardwareTrapCompiledMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/HardwareTrapGCMapIterator.java b/rvm/src/org/jikesrvm/compilers/common/HardwareTrapGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/HardwareTrapGCMapIterator.java
rename to rvm/src/org/jikesrvm/compilers/common/HardwareTrapGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/RecompilationManager.java b/rvm/src/org/jikesrvm/compilers/common/RecompilationManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/RecompilationManager.java
rename to rvm/src/org/jikesrvm/compilers/common/RecompilationManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java b/rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java
rename to rvm/src/org/jikesrvm/compilers/common/RuntimeCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/AbstractAssembler.java b/rvm/src/org/jikesrvm/compilers/common/assembler/AbstractAssembler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/AbstractAssembler.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/AbstractAssembler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ForwardReference.java b/rvm/src/org/jikesrvm/compilers/common/assembler/ForwardReference.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ForwardReference.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/ForwardReference.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/AssemblerConstants.java b/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/AssemblerConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/AssemblerConstants.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/ia32/AssemblerConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/Lister.java b/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/Lister.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ia32/Lister.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/ia32/Lister.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/Assembler.java b/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/Assembler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/Assembler.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/ppc/Assembler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerConstants.java b/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerConstants.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerShortBranch.java b/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerShortBranch.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerShortBranch.java
rename to rvm/src/org/jikesrvm/compilers/common/assembler/ppc/AssemblerShortBranch.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/AdjustBranchProbabilities.java b/rvm/src/org/jikesrvm/compilers/opt/AdjustBranchProbabilities.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/AdjustBranchProbabilities.java
rename to rvm/src/org/jikesrvm/compilers/opt/AdjustBranchProbabilities.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java b/rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java
rename to rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/DefUse.java b/rvm/src/org/jikesrvm/compilers/opt/DefUse.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/DefUse.java
rename to rvm/src/org/jikesrvm/compilers/opt/DefUse.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ExpressionFolding.java b/rvm/src/org/jikesrvm/compilers/opt/ExpressionFolding.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ExpressionFolding.java
rename to rvm/src/org/jikesrvm/compilers/opt/ExpressionFolding.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/FieldAnalysis.java b/rvm/src/org/jikesrvm/compilers/opt/FieldAnalysis.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/FieldAnalysis.java
rename to rvm/src/org/jikesrvm/compilers/opt/FieldAnalysis.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/FieldDatabase.java b/rvm/src/org/jikesrvm/compilers/opt/FieldDatabase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/FieldDatabase.java
rename to rvm/src/org/jikesrvm/compilers/opt/FieldDatabase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/InstrumentedEventCounterManager.java b/rvm/src/org/jikesrvm/compilers/opt/InstrumentedEventCounterManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/InstrumentedEventCounterManager.java
rename to rvm/src/org/jikesrvm/compilers/opt/InstrumentedEventCounterManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/LocalCSE.java b/rvm/src/org/jikesrvm/compilers/opt/LocalCSE.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/LocalCSE.java
rename to rvm/src/org/jikesrvm/compilers/opt/LocalCSE.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/LocalCastOptimization.java b/rvm/src/org/jikesrvm/compilers/opt/LocalCastOptimization.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/LocalCastOptimization.java
rename to rvm/src/org/jikesrvm/compilers/opt/LocalCastOptimization.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/LocalConstantProp.java b/rvm/src/org/jikesrvm/compilers/opt/LocalConstantProp.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/LocalConstantProp.java
rename to rvm/src/org/jikesrvm/compilers/opt/LocalConstantProp.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/LocalCopyProp.java b/rvm/src/org/jikesrvm/compilers/opt/LocalCopyProp.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/LocalCopyProp.java
rename to rvm/src/org/jikesrvm/compilers/opt/LocalCopyProp.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/MagicNotImplementedException.java b/rvm/src/org/jikesrvm/compilers/opt/MagicNotImplementedException.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/MagicNotImplementedException.java
rename to rvm/src/org/jikesrvm/compilers/opt/MagicNotImplementedException.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/MutateSplits.java b/rvm/src/org/jikesrvm/compilers/opt/MutateSplits.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/MutateSplits.java
rename to rvm/src/org/jikesrvm/compilers/opt/MutateSplits.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/NullCheckCombining.java b/rvm/src/org/jikesrvm/compilers/opt/NullCheckCombining.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/NullCheckCombining.java
rename to rvm/src/org/jikesrvm/compilers/opt/NullCheckCombining.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/OperationNotImplementedException.java b/rvm/src/org/jikesrvm/compilers/opt/OperationNotImplementedException.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/OperationNotImplementedException.java
rename to rvm/src/org/jikesrvm/compilers/opt/OperationNotImplementedException.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/OptimizingCompilerException.java b/rvm/src/org/jikesrvm/compilers/opt/OptimizingCompilerException.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/OptimizingCompilerException.java
rename to rvm/src/org/jikesrvm/compilers/opt/OptimizingCompilerException.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/Simple.java b/rvm/src/org/jikesrvm/compilers/opt/Simple.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/Simple.java
rename to rvm/src/org/jikesrvm/compilers/opt/Simple.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/Simplifier.java b/rvm/src/org/jikesrvm/compilers/opt/Simplifier.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/Simplifier.java
rename to rvm/src/org/jikesrvm/compilers/opt/Simplifier.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java b/rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java
rename to rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ConvertBCtoHIR.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ConvertBCtoHIR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ConvertBCtoHIR.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/ConvertBCtoHIR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerateMagic.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/IRGenOptions.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/IRGenOptions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/IRGenOptions.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/IRGenOptions.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/OsrPointConstructor.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/OsrPointConstructor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/OsrPointConstructor.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/OsrPointConstructor.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ia32/GenerateMachineSpecificMagic.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ia32/GenerateMachineSpecificMagic.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ia32/GenerateMachineSpecificMagic.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/ia32/GenerateMachineSpecificMagic.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ppc/GenerateMachineSpecificMagic.java b/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ppc/GenerateMachineSpecificMagic.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/bc2ir/ppc/GenerateMachineSpecificMagic.java
rename to rvm/src/org/jikesrvm/compilers/opt/bc2ir/ppc/GenerateMachineSpecificMagic.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTGraph.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTNode.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/AnnotatedLSTNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizationDriver.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizationDriver.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizationDriver.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizationDriver.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizations.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizations.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizations.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchOptimizations.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchSimplifier.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchSimplifier.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchSimplifier.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/BranchSimplifier.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BuildLST.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/BuildLST.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/BuildLST.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/BuildLST.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/CFGTransformations.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/CFGTransformations.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/CFGTransformations.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/CFGTransformations.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/Diamond.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/Diamond.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/Diamond.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/Diamond.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominanceFrontier.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominanceFrontier.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominanceFrontier.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominanceFrontier.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorCell.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorCell.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorCell.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorCell.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorInfo.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorInfo.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorOperator.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorOperator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorOperator.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorOperator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorSystem.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorSystem.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorSystem.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorSystem.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTree.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTree.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTree.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTree.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreeNode.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreeNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreeNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreeNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreePhase.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreePhase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreePhase.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorTreePhase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/Dominators.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/Dominators.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/Dominators.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/Dominators.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorsPhase.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorsPhase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorsPhase.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/DominatorsPhase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/EstimateBlockFrequencies.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/EstimateBlockFrequencies.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/EstimateBlockFrequencies.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/EstimateBlockFrequencies.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTGraph.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTNode.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/LSTNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominatorInfo.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominatorInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominatorInfo.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominatorInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominators.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominators.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominators.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/LTDominators.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopAnalysis.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopAnalysis.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopAnalysis.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopAnalysis.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopUnrolling.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopUnrolling.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopUnrolling.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/LoopUnrolling.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/MIRBranchOptimizations.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/MIRBranchOptimizations.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/MIRBranchOptimizations.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/MIRBranchOptimizations.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/PostDominatorsPhase.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/PostDominatorsPhase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/PostDominatorsPhase.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/PostDominatorsPhase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/ReorderingPhase.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/ReorderingPhase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/ReorderingPhase.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/ReorderingPhase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/StaticSplitting.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/StaticSplitting.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/StaticSplitting.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/StaticSplitting.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/TailRecursionElimination.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/TailRecursionElimination.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/TailRecursionElimination.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/TailRecursionElimination.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/YieldPoints.java b/rvm/src/org/jikesrvm/compilers/opt/controlflow/YieldPoints.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/controlflow/YieldPoints.java
rename to rvm/src/org/jikesrvm/compilers/opt/controlflow/YieldPoints.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraph.java b/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphConstants.java b/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphEdge.java b/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphEdge.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphEdge.java
rename to rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphEdge.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphNode.java b/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphStats.java b/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphStats.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphStats.java
rename to rvm/src/org/jikesrvm/compilers/opt/depgraph/DepGraphStats.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_AbstractCell.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_AbstractCell.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_AbstractCell.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_AbstractCell.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Equation.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Equation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Equation.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Equation.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Graph.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Graph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Graph.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Graph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_LatticeCell.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_LatticeCell.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_LatticeCell.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_LatticeCell.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Operator.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Operator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Operator.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Operator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Solution.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Solution.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Solution.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_Solution.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_System.java b/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_System.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_System.java
rename to rvm/src/org/jikesrvm/compilers/opt/dfsolver/DF_System.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/CompilationPlan.java b/rvm/src/org/jikesrvm/compilers/opt/driver/CompilationPlan.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/CompilationPlan.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/CompilationPlan.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/CompilerPhase.java b/rvm/src/org/jikesrvm/compilers/opt/driver/CompilerPhase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/CompilerPhase.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/CompilerPhase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/IRPrinter.java b/rvm/src/org/jikesrvm/compilers/opt/driver/IRPrinter.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/IRPrinter.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/IRPrinter.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/InstrumentationPlan.java b/rvm/src/org/jikesrvm/compilers/opt/driver/InstrumentationPlan.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/InstrumentationPlan.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/InstrumentationPlan.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptConstants.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanAtomicElement.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanAtomicElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanAtomicElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanAtomicElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanCompositeElement.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanCompositeElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanCompositeElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanCompositeElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanElement.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanner.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanner.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanner.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptimizationPlanner.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingBootImageCompiler.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingBootImageCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingBootImageCompiler.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingBootImageCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingCompiler.java b/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingCompiler.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/OptimizingCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/ia32/MIROptimizationPlanner.java b/rvm/src/org/jikesrvm/compilers/opt/driver/ia32/MIROptimizationPlanner.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/ia32/MIROptimizationPlanner.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/ia32/MIROptimizationPlanner.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/driver/ppc/MIROptimizationPlanner.java b/rvm/src/org/jikesrvm/compilers/opt/driver/ppc/MIROptimizationPlanner.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/driver/ppc/MIROptimizationPlanner.java
rename to rvm/src/org/jikesrvm/compilers/opt/driver/ppc/MIROptimizationPlanner.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/AggregateReplacer.java b/rvm/src/org/jikesrvm/compilers/opt/escape/AggregateReplacer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/AggregateReplacer.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/AggregateReplacer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/EscapeTransformations.java b/rvm/src/org/jikesrvm/compilers/opt/escape/EscapeTransformations.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/EscapeTransformations.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/EscapeTransformations.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/FI_EscapeSummary.java b/rvm/src/org/jikesrvm/compilers/opt/escape/FI_EscapeSummary.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/FI_EscapeSummary.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/FI_EscapeSummary.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/MethodSummary.java b/rvm/src/org/jikesrvm/compilers/opt/escape/MethodSummary.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/MethodSummary.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/MethodSummary.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/ObjectReplacer.java b/rvm/src/org/jikesrvm/compilers/opt/escape/ObjectReplacer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/ObjectReplacer.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/ObjectReplacer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/ShortArrayReplacer.java b/rvm/src/org/jikesrvm/compilers/opt/escape/ShortArrayReplacer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/ShortArrayReplacer.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/ShortArrayReplacer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java b/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/SimpleEscape.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SummaryDatabase.java b/rvm/src/org/jikesrvm/compilers/opt/escape/SummaryDatabase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/SummaryDatabase.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/SummaryDatabase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/escape/UnsyncReplacer.java b/rvm/src/org/jikesrvm/compilers/opt/escape/UnsyncReplacer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/escape/UnsyncReplacer.java
rename to rvm/src/org/jikesrvm/compilers/opt/escape/UnsyncReplacer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertHIRtoLIR.java b/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertHIRtoLIR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertHIRtoLIR.java
rename to rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertHIRtoLIR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertToLowLevelIR.java b/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertToLowLevelIR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertToLowLevelIR.java
rename to rvm/src/org/jikesrvm/compilers/opt/hir2lir/ConvertToLowLevelIR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/DynamicTypeCheckExpansion.java b/rvm/src/org/jikesrvm/compilers/opt/hir2lir/DynamicTypeCheckExpansion.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/DynamicTypeCheckExpansion.java
rename to rvm/src/org/jikesrvm/compilers/opt/hir2lir/DynamicTypeCheckExpansion.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java b/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
rename to rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTree.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTree.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTree.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTree.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTreeNode.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTreeNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTreeNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/CallSiteTreeNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/ClassLoadingDependencyManager.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/ClassLoadingDependencyManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/ClassLoadingDependencyManager.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/ClassLoadingDependencyManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/CompilationState.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/CompilationState.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/CompilationState.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/CompilationState.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/DefaultInlineOracle.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/DefaultInlineOracle.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/DefaultInlineOracle.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/DefaultInlineOracle.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineDecision.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineDecision.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineDecision.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/InlineDecision.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineOracle.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineOracle.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineOracle.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/InlineOracle.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineSequence.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineSequence.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineSequence.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/InlineSequence.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/Inliner.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/Inliner.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/Inliner.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/Inliner.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InterfaceHierarchy.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/InterfaceHierarchy.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InterfaceHierarchy.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/InterfaceHierarchy.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InvalidationDatabase.java b/rvm/src/org/jikesrvm/compilers/opt/inlining/InvalidationDatabase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/inlining/InvalidationDatabase.java
rename to rvm/src/org/jikesrvm/compilers/opt/inlining/InvalidationDatabase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/DefaultPriority.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/DefaultPriority.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/DefaultPriority.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/DefaultPriority.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/PrePassScheduler.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/PrePassScheduler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/PrePassScheduler.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/PrePassScheduler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/Priority.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/Priority.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/Priority.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/Priority.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceMap.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceMap.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceReservation.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceReservation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceReservation.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/ResourceReservation.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/Scheduler.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/Scheduler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/Scheduler.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/Scheduler.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/SchedulingInfo.java b/rvm/src/org/jikesrvm/compilers/opt/instrsched/SchedulingInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/instrsched/SchedulingInfo.java
rename to rvm/src/org/jikesrvm/compilers/opt/instrsched/SchedulingInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/AbstractRegisterPool.java b/rvm/src/org/jikesrvm/compilers/opt/ir/AbstractRegisterPool.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/AbstractRegisterPool.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/AbstractRegisterPool.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlock.java b/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlock.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlock.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlockEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlockEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlockEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/BasicBlockEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ControlFlowGraph.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ControlFlowGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ControlFlowGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ControlFlowGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/EmptyBasicBlockEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/ir/EmptyBasicBlockEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/EmptyBasicBlockEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/EmptyBasicBlockEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlock.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlock.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlock.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlockBag.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlockBag.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlockBag.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ExceptionHandlerBasicBlockBag.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMap.java b/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMap.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMapElement.java b/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMapElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMapElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/GCIRMapElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterSet.java b/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterSet.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterTools.java b/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterTools.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterTools.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/GenericPhysicalRegisterTools.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GenericRegisterPool.java b/rvm/src/org/jikesrvm/compilers/opt/ir/GenericRegisterPool.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/GenericRegisterPool.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/GenericRegisterPool.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/HIRInfo.java b/rvm/src/org/jikesrvm/compilers/opt/ir/HIRInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/HIRInfo.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/HIRInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IR.java b/rvm/src/org/jikesrvm/compilers/opt/ir/IR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IR.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/IR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IREnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/ir/IREnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IREnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/IREnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IRSummary.java b/rvm/src/org/jikesrvm/compilers/opt/ir/IRSummary.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IRSummary.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/IRSummary.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IRTools.java b/rvm/src/org/jikesrvm/compilers/opt/ir/IRTools.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/IRTools.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/IRTools.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/Instruction.java b/rvm/src/org/jikesrvm/compilers/opt/ir/Instruction.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/Instruction.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/Instruction.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/InstructionEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/ir/InstructionEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/InstructionEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/InstructionEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/LIRInfo.java b/rvm/src/org/jikesrvm/compilers/opt/ir/LIRInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/LIRInfo.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/LIRInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/MIRInfo.java b/rvm/src/org/jikesrvm/compilers/opt/ir/MIRInfo.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/MIRInfo.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/MIRInfo.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/MachineSpecificIR.java b/rvm/src/org/jikesrvm/compilers/opt/ir/MachineSpecificIR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/MachineSpecificIR.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/MachineSpecificIR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/OperandEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/ir/OperandEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/OperandEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/OperandEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/RegSpillListElement.java b/rvm/src/org/jikesrvm/compilers/opt/ir/RegSpillListElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/RegSpillListElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/RegSpillListElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/Register.java b/rvm/src/org/jikesrvm/compilers/opt/ir/Register.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/Register.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/Register.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/RegisterOperandEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/ir/RegisterOperandEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/RegisterOperandEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/RegisterOperandEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/WeightedBranchTargets.java b/rvm/src/org/jikesrvm/compilers/opt/ir/WeightedBranchTargets.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/WeightedBranchTargets.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/WeightedBranchTargets.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/MachineSpecificIRIA.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/MachineSpecificIRIA.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/MachineSpecificIRIA.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ia32/MachineSpecificIRIA.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalDefUse.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalDefUse.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalDefUse.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalDefUse.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterSet.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterSet.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterTools.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterTools.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterTools.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ia32/PhysicalRegisterTools.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/RegisterPool.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/RegisterPool.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ia32/RegisterPool.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ia32/RegisterPool.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/AddressConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/AddressConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/AddressConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/AddressConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BasicBlockOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BasicBlockOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BasicBlockOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/BasicBlockOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchProfileOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchProfileOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchProfileOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/BranchProfileOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ClassConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ClassConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ClassConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ClassConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/CodeConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/CodeConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/CodeConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/CodeConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConditionOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConditionOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConditionOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConditionOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/DoubleConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/DoubleConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/DoubleConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/DoubleConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/FloatConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/FloatConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/FloatConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/FloatConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/HeapOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/HeapOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/HeapOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/HeapOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/InlinedOsrTypeInfoOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/InlinedOsrTypeInfoOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/InlinedOsrTypeInfoOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/InlinedOsrTypeInfoOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/IntConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/IntConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/IntConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/IntConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LocationOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LocationOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LocationOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/LocationOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LongConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LongConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/LongConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/LongConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MemoryOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MemoryOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MemoryOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/MemoryOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MethodOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MethodOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/MethodOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/MethodOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/NullConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/NullConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/NullConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/NullConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ObjectConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ObjectConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ObjectConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ObjectConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/Operand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/Operand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/Operand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/Operand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/OsrTypeInfoOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/OsrTypeInfoOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/OsrTypeInfoOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/OsrTypeInfoOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StackLocationOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StackLocationOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StackLocationOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/StackLocationOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StringConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StringConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/StringConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/StringConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TIBConstantOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TIBConstantOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TIBConstantOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/TIBConstantOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrapCodeOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrapCodeOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrapCodeOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrapCodeOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrueGuardOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrueGuardOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrueGuardOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/TrueGuardOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TypeOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TypeOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/TypeOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/TypeOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/UnreachableOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/UnreachableOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/UnreachableOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/UnreachableOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/BURSManagedFPROperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/BURSManagedFPROperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/BURSManagedFPROperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/BURSManagedFPROperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/IA32ConditionOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/IA32ConditionOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/IA32ConditionOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ia32/IA32ConditionOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCConditionOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCConditionOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCConditionOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCConditionOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCTrapOperand.java b/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCTrapOperand.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCTrapOperand.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/operand/ppc/PowerPCTrapOperand.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/MachineSpecificIRPowerPC.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/MachineSpecificIRPowerPC.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/MachineSpecificIRPowerPC.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ppc/MachineSpecificIRPowerPC.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalDefUse.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalDefUse.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalDefUse.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalDefUse.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterSet.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterSet.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterTools.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterTools.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterTools.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterTools.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/RegisterPool.java b/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/RegisterPool.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ir/ppc/RegisterPool.java
rename to rvm/src/org/jikesrvm/compilers/opt/ir/ppc/RegisterPool.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_Common_Helpers.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_Common_Helpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_Common_Helpers.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_Common_Helpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_IntConstantTreeNode.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_IntConstantTreeNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_IntConstantTreeNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_IntConstantTreeNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_MemOp_Helpers.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_MemOp_Helpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_MemOp_Helpers.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/BURS_MemOp_Helpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ConvertLIRtoMIR.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ConvertLIRtoMIR.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ConvertLIRtoMIR.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ConvertLIRtoMIR.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/MinimalBURS.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/MinimalBURS.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/MinimalBURS.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/MinimalBURS.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/NormalBURS.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/NormalBURS.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/NormalBURS.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/NormalBURS.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/SplitBasicBlock.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/SplitBasicBlock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/SplitBasicBlock.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/SplitBasicBlock.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/BURS_Helpers.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/BURS_Helpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/BURS_Helpers.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/BURS_Helpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ComplexLIR2MIRExpansion.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ComplexLIR2MIRExpansion.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ComplexLIR2MIRExpansion.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ComplexLIR2MIRExpansion.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ConvertALUOperators.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ConvertALUOperators.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ConvertALUOperators.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/ConvertALUOperators.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/NormalizeConstants.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/NormalizeConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/NormalizeConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ia32/NormalizeConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ComplexLIR2MIRExpansion.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ComplexLIR2MIRExpansion.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ComplexLIR2MIRExpansion.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ComplexLIR2MIRExpansion.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ConvertALUOperators.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ConvertALUOperators.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ConvertALUOperators.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/ConvertALUOperators.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/NormalizeConstants.java b/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/NormalizeConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/NormalizeConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/NormalizeConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveAnalysis.java b/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveAnalysis.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveAnalysis.java
rename to rvm/src/org/jikesrvm/compilers/opt/liveness/LiveAnalysis.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveInterval.java b/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveInterval.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveInterval.java
rename to rvm/src/org/jikesrvm/compilers/opt/liveness/LiveInterval.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveIntervalEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveIntervalEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveIntervalEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/liveness/LiveIntervalEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSet.java b/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSet.java
rename to rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetElement.java b/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/liveness/LiveSetEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/AssemblerDriver.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/AssemblerDriver.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/AssemblerDriver.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/AssemblerDriver.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ConvertMIRtoMC.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ConvertMIRtoMC.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ConvertMIRtoMC.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/ConvertMIRtoMC.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/FinalMIRExpansionDriver.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/FinalMIRExpansionDriver.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/FinalMIRExpansionDriver.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/FinalMIRExpansionDriver.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/AssemblerBase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/FinalMIRExpansion.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/FinalMIRExpansion.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/FinalMIRExpansion.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/ia32/FinalMIRExpansion.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/AssemblerOpt.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/AssemblerOpt.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/AssemblerOpt.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/AssemblerOpt.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/FinalMIRExpansion.java b/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/FinalMIRExpansion.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/FinalMIRExpansion.java
rename to rvm/src/org/jikesrvm/compilers/opt/mir2mc/ppc/FinalMIRExpansion.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/BlockCountSpillCost.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/BlockCountSpillCost.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/BlockCountSpillCost.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/BlockCountSpillCost.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/BrainDeadSpillCost.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/BrainDeadSpillCost.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/BrainDeadSpillCost.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/BrainDeadSpillCost.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/Coalesce.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/Coalesce.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/Coalesce.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/Coalesce.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceGraph.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceMoves.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceMoves.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceMoves.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/CoalesceMoves.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ExpandCallingConvention.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ExpandCallingConvention.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ExpandCallingConvention.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ExpandCallingConvention.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterPreferences.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterPreferences.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterPreferences.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterPreferences.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterRestrictions.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterRestrictions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterRestrictions.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericRegisterRestrictions.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericStackManager.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericStackManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericStackManager.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericStackManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/LinearScan.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/LinearScan.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/LinearScan.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/LinearScan.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/LiveIntervalElement.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/LiveIntervalElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/LiveIntervalElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/LiveIntervalElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/PrologueEpilogueCreator.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/PrologueEpilogueCreator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/PrologueEpilogueCreator.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/PrologueEpilogueCreator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocator.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocator.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocatorState.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocatorState.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocatorState.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/RegisterAllocatorState.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ScratchMap.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ScratchMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ScratchMap.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ScratchMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/SimpleSpillCost.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/SimpleSpillCost.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/SimpleSpillCost.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/SimpleSpillCost.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/SpillCostEstimator.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/SpillCostEstimator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/SpillCostEstimator.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/SpillCostEstimator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/CallingConvention.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/CallingConvention.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/CallingConvention.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/CallingConvention.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/ExpandFPRStackConvention.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/ExpandFPRStackConvention.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/ExpandFPRStackConvention.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/ExpandFPRStackConvention.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/MIRSplitRanges.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/MIRSplitRanges.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/MIRSplitRanges.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/MIRSplitRanges.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/PhysicalRegisterConstants.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/PhysicalRegisterConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/PhysicalRegisterConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/PhysicalRegisterConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterPreferences.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterPreferences.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterPreferences.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterPreferences.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterRestrictions.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterRestrictions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterRestrictions.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/RegisterRestrictions.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/StackManager.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/StackManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/StackManager.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ia32/StackManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/CallingConvention.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/CallingConvention.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/CallingConvention.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/CallingConvention.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/MIRSplitRanges.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/MIRSplitRanges.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/MIRSplitRanges.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/MIRSplitRanges.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/PhysicalRegisterConstants.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/PhysicalRegisterConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/PhysicalRegisterConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/PhysicalRegisterConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterPreferences.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterPreferences.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterPreferences.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterPreferences.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterRestrictions.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterRestrictions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterRestrictions.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/RegisterRestrictions.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/StackManager.java b/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/StackManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/StackManager.java
rename to rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/StackManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptCompiledMethod.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptCompiledMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptCompiledMethod.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptCompiledMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptEncodedCallSiteTree.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptEncodedCallSiteTree.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptEncodedCallSiteTree.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptEncodedCallSiteTree.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptExceptionTable.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptExceptionTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptExceptionTable.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptExceptionTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGCMap.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGCMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGCMap.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGCMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGenericGCMapIterator.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGenericGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGenericGCMapIterator.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGenericGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptLinker.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptLinker.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptLinker.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptLinker.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptMachineCodeMap.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptMachineCodeMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptMachineCodeMap.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptMachineCodeMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptSaveVolatile.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptSaveVolatile.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptSaveVolatile.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptSaveVolatile.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptExceptionDeliverer.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptExceptionDeliverer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptExceptionDeliverer.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptExceptionDeliverer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIterator.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIterator.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIteratorConstants.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIteratorConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIteratorConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIteratorConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptExceptionDeliverer.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptExceptionDeliverer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptExceptionDeliverer.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptExceptionDeliverer.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIterator.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIterator.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIteratorConstants.java b/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIteratorConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIteratorConstants.java
rename to rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIteratorConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/InvokeeThreadLocalContext.java b/rvm/src/org/jikesrvm/compilers/opt/specialization/InvokeeThreadLocalContext.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/InvokeeThreadLocalContext.java
rename to rvm/src/org/jikesrvm/compilers/opt/specialization/InvokeeThreadLocalContext.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationContext.java b/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationContext.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationContext.java
rename to rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationContext.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationDatabase.java b/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationDatabase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationDatabase.java
rename to rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializationDatabase.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethod.java b/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethod.java
rename to rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethodPool.java b/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethodPool.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethodPool.java
rename to rvm/src/org/jikesrvm/compilers/opt/specialization/SpecializedMethodPool.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/EnterSSA.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/EnterSSA.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/EnterSSA.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/EnterSSA.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GCP.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/GCP.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GCP.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/GCP.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GVCongruenceClass.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/GVCongruenceClass.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GVCongruenceClass.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/GVCongruenceClass.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalCSE.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalCSE.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalCSE.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalCSE.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumber.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumber.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumber.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumber.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumberState.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumberState.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumberState.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/GlobalValueNumberState.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/HeapVariable.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/HeapVariable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/HeapVariable.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/HeapVariable.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagation.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagation.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagation.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagation.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagationSystem.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagationSystem.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagationSystem.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/IndexPropagationSystem.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LICM.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/LICM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LICM.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/LICM.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LeaveSSA.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/LeaveSSA.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LeaveSSA.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/LeaveSSA.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LiveRangeSplitting.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/LiveRangeSplitting.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LiveRangeSplitting.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/LiveRangeSplitting.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LoadElimination.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/LoadElimination.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LoadElimination.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/LoadElimination.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LoopVersioning.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/LoopVersioning.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/LoopVersioning.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/LoopVersioning.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/PiNodes.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/PiNodes.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/PiNodes.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/PiNodes.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/RedundantBranchElimination.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/RedundantBranchElimination.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/RedundantBranchElimination.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/RedundantBranchElimination.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSA.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/SSA.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSA.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/SSA.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSADictionary.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/SSADictionary.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSADictionary.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/SSADictionary.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSAOptions.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/SSAOptions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSAOptions.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/SSAOptions.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSATuneUp.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/SSATuneUp.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/SSATuneUp.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/SSATuneUp.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/UniformlyGeneratedGVN.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/UniformlyGeneratedGVN.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/UniformlyGeneratedGVN.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/UniformlyGeneratedGVN.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraph.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphEdge.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphEdge.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphEdge.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphEdge.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphParamLabel.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphParamLabel.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphParamLabel.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphParamLabel.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphVertex.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphVertex.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphVertex.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/ValueGraphVertex.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueNumberPair.java b/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueNumberPair.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/ssa/ValueNumberPair.java
rename to rvm/src/org/jikesrvm/compilers/opt/ssa/ValueNumberPair.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/BitSet.java b/rvm/src/org/jikesrvm/compilers/opt/util/BitSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/BitSet.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/BitSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/BitSetMapping.java b/rvm/src/org/jikesrvm/compilers/opt/util/BitSetMapping.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/BitSetMapping.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/BitSetMapping.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/Bits.java b/rvm/src/org/jikesrvm/compilers/opt/util/Bits.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/Bits.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/Bits.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/CompoundEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/CompoundEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/CompoundEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/CompoundEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/DFSenumerateByFinish.java b/rvm/src/org/jikesrvm/compilers/opt/util/DFSenumerateByFinish.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/DFSenumerateByFinish.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/DFSenumerateByFinish.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/DepthFirstEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/DepthFirstEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/DepthFirstEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/DepthFirstEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/EmptyEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/EmptyEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/EmptyEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/EmptyEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/EmptyIterator.java b/rvm/src/org/jikesrvm/compilers/opt/util/EmptyIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/EmptyIterator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/EmptyIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/FilterEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/FilterEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/FilterEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/FilterEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/FilterIterator.java b/rvm/src/org/jikesrvm/compilers/opt/util/FilterIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/FilterIterator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/FilterIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/FilteredDFSenumerateByFinish.java b/rvm/src/org/jikesrvm/compilers/opt/util/FilteredDFSenumerateByFinish.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/FilteredDFSenumerateByFinish.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/FilteredDFSenumerateByFinish.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/Graph.java b/rvm/src/org/jikesrvm/compilers/opt/util/Graph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/Graph.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/Graph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdge.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdge.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdge.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphEdge.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdgeFilter.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdgeFilter.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphEdgeFilter.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphEdgeFilter.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphElement.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphElement.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphNode.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumeration.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumeration.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumeration.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumeration.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphNodeEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphUtilities.java b/rvm/src/org/jikesrvm/compilers/opt/util/GraphUtilities.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/GraphUtilities.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/GraphUtilities.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/Queue.java b/rvm/src/org/jikesrvm/compilers/opt/util/Queue.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/Queue.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/Queue.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/ReverseDFSenumerateByFinish.java b/rvm/src/org/jikesrvm/compilers/opt/util/ReverseDFSenumerateByFinish.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/ReverseDFSenumerateByFinish.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/ReverseDFSenumerateByFinish.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/ReverseEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/ReverseEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/ReverseEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/ReverseEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/ReverseFilteredDFSenumerateByFinish.java b/rvm/src/org/jikesrvm/compilers/opt/util/ReverseFilteredDFSenumerateByFinish.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/ReverseFilteredDFSenumerateByFinish.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/ReverseFilteredDFSenumerateByFinish.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphIterator.java b/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphIterator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphNode.java b/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SortedGraphNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraph.java b/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraph.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraph.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraph.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdge.java b/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdge.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdge.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdge.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdgeList.java b/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdgeList.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdgeList.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphEdgeList.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNode.java b/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeList.java b/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeList.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeList.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeList.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeListHeader.java b/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeListHeader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeListHeader.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/SpaceEffGraphNodeListHeader.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/Stack.java b/rvm/src/org/jikesrvm/compilers/opt/util/Stack.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/Stack.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/Stack.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/TopSort.java b/rvm/src/org/jikesrvm/compilers/opt/util/TopSort.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/TopSort.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/TopSort.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/TopSortInterface.java b/rvm/src/org/jikesrvm/compilers/opt/util/TopSortInterface.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/TopSortInterface.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/TopSortInterface.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/Tree.java b/rvm/src/org/jikesrvm/compilers/opt/util/Tree.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/Tree.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/Tree.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeBottomUpEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/TreeBottomUpEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeBottomUpEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/TreeBottomUpEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeNode.java b/rvm/src/org/jikesrvm/compilers/opt/util/TreeNode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeNode.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/TreeNode.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeNodeChildrenEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/TreeNodeChildrenEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeNodeChildrenEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/TreeNodeChildrenEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeTopDownEnumerator.java b/rvm/src/org/jikesrvm/compilers/opt/util/TreeTopDownEnumerator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/compilers/opt/util/TreeTopDownEnumerator.java
rename to rvm/src/org/jikesrvm/compilers/opt/util/TreeTopDownEnumerator.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/ArchConstants.java b/rvm/src/org/jikesrvm/ia32/ArchConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/ArchConstants.java
rename to rvm/src/org/jikesrvm/ia32/ArchConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/BaselineConstants.java b/rvm/src/org/jikesrvm/ia32/BaselineConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/BaselineConstants.java
rename to rvm/src/org/jikesrvm/ia32/BaselineConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/Code.java b/rvm/src/org/jikesrvm/ia32/Code.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/Code.java
rename to rvm/src/org/jikesrvm/ia32/Code.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/CodeArray.java b/rvm/src/org/jikesrvm/ia32/CodeArray.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/CodeArray.java
rename to rvm/src/org/jikesrvm/ia32/CodeArray.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/DynamicLinkerHelper.java b/rvm/src/org/jikesrvm/ia32/DynamicLinkerHelper.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/DynamicLinkerHelper.java
rename to rvm/src/org/jikesrvm/ia32/DynamicLinkerHelper.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/InterfaceMethodConflictResolver.java b/rvm/src/org/jikesrvm/ia32/InterfaceMethodConflictResolver.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/InterfaceMethodConflictResolver.java
rename to rvm/src/org/jikesrvm/ia32/InterfaceMethodConflictResolver.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/LazyCompilationTrampoline.java b/rvm/src/org/jikesrvm/ia32/LazyCompilationTrampoline.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/LazyCompilationTrampoline.java
rename to rvm/src/org/jikesrvm/ia32/LazyCompilationTrampoline.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/MachineCode.java b/rvm/src/org/jikesrvm/ia32/MachineCode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/MachineCode.java
rename to rvm/src/org/jikesrvm/ia32/MachineCode.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/MachineReflection.java b/rvm/src/org/jikesrvm/ia32/MachineReflection.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/MachineReflection.java
rename to rvm/src/org/jikesrvm/ia32/MachineReflection.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/MachineSpecificIA.java b/rvm/src/org/jikesrvm/ia32/MachineSpecificIA.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/MachineSpecificIA.java
rename to rvm/src/org/jikesrvm/ia32/MachineSpecificIA.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java b/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java
rename to rvm/src/org/jikesrvm/ia32/MultianewarrayHelper.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/OutOfLineMachineCode.java b/rvm/src/org/jikesrvm/ia32/OutOfLineMachineCode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/OutOfLineMachineCode.java
rename to rvm/src/org/jikesrvm/ia32/OutOfLineMachineCode.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/RegisterConstants.java b/rvm/src/org/jikesrvm/ia32/RegisterConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/RegisterConstants.java
rename to rvm/src/org/jikesrvm/ia32/RegisterConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/Registers.java b/rvm/src/org/jikesrvm/ia32/Registers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/Registers.java
rename to rvm/src/org/jikesrvm/ia32/Registers.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/StackframeLayoutConstants.java b/rvm/src/org/jikesrvm/ia32/StackframeLayoutConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/StackframeLayoutConstants.java
rename to rvm/src/org/jikesrvm/ia32/StackframeLayoutConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/ThreadLocalState.java b/rvm/src/org/jikesrvm/ia32/ThreadLocalState.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/ThreadLocalState.java
rename to rvm/src/org/jikesrvm/ia32/ThreadLocalState.java
diff --git a/trunk/rvm/src/org/jikesrvm/ia32/TrapConstants.java b/rvm/src/org/jikesrvm/ia32/TrapConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ia32/TrapConstants.java
rename to rvm/src/org/jikesrvm/ia32/TrapConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/FunctionTable.java b/rvm/src/org/jikesrvm/jni/FunctionTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/FunctionTable.java
rename to rvm/src/org/jikesrvm/jni/FunctionTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/JNICompiledMethod.java b/rvm/src/org/jikesrvm/jni/JNICompiledMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/JNICompiledMethod.java
rename to rvm/src/org/jikesrvm/jni/JNICompiledMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/JNIEnvironment.java b/rvm/src/org/jikesrvm/jni/JNIEnvironment.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/JNIEnvironment.java
rename to rvm/src/org/jikesrvm/jni/JNIEnvironment.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/JNIFunctions.java b/rvm/src/org/jikesrvm/jni/JNIFunctions.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/JNIFunctions.java
rename to rvm/src/org/jikesrvm/jni/JNIFunctions.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/JNIGenericHelpers.java b/rvm/src/org/jikesrvm/jni/JNIGenericHelpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/JNIGenericHelpers.java
rename to rvm/src/org/jikesrvm/jni/JNIGenericHelpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/JNIGlobalRefTable.java b/rvm/src/org/jikesrvm/jni/JNIGlobalRefTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/JNIGlobalRefTable.java
rename to rvm/src/org/jikesrvm/jni/JNIGlobalRefTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/LinkageTripletTable.java b/rvm/src/org/jikesrvm/jni/LinkageTripletTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/LinkageTripletTable.java
rename to rvm/src/org/jikesrvm/jni/LinkageTripletTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ia32/JNICompiler.java b/rvm/src/org/jikesrvm/jni/ia32/JNICompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ia32/JNICompiler.java
rename to rvm/src/org/jikesrvm/jni/ia32/JNICompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ia32/JNIExceptionDeliverer.java b/rvm/src/org/jikesrvm/jni/ia32/JNIExceptionDeliverer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ia32/JNIExceptionDeliverer.java
rename to rvm/src/org/jikesrvm/jni/ia32/JNIExceptionDeliverer.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ia32/JNIGCMapIterator.java b/rvm/src/org/jikesrvm/jni/ia32/JNIGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ia32/JNIGCMapIterator.java
rename to rvm/src/org/jikesrvm/jni/ia32/JNIGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ia32/JNIHelpers.java b/rvm/src/org/jikesrvm/jni/ia32/JNIHelpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ia32/JNIHelpers.java
rename to rvm/src/org/jikesrvm/jni/ia32/JNIHelpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ppc/JNICompiler.java b/rvm/src/org/jikesrvm/jni/ppc/JNICompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ppc/JNICompiler.java
rename to rvm/src/org/jikesrvm/jni/ppc/JNICompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ppc/JNIGCMapIterator.java b/rvm/src/org/jikesrvm/jni/ppc/JNIGCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ppc/JNIGCMapIterator.java
rename to rvm/src/org/jikesrvm/jni/ppc/JNIGCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java b/rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java
rename to rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java
diff --git a/trunk/rvm/src/org/jikesrvm/jni/ppc/JNIStackframeLayoutConstants.java b/rvm/src/org/jikesrvm/jni/ppc/JNIStackframeLayoutConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/jni/ppc/JNIStackframeLayoutConstants.java
rename to rvm/src/org/jikesrvm/jni/ppc/JNIStackframeLayoutConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/Barrier.java b/rvm/src/org/jikesrvm/mm/mminterface/Barrier.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/Barrier.java
rename to rvm/src/org/jikesrvm/mm/mminterface/Barrier.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java b/rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java
rename to rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/DebugUtil.java b/rvm/src/org/jikesrvm/mm/mminterface/DebugUtil.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/DebugUtil.java
rename to rvm/src/org/jikesrvm/mm/mminterface/DebugUtil.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/GCMapIterator.java b/rvm/src/org/jikesrvm/mm/mminterface/GCMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/GCMapIterator.java
rename to rvm/src/org/jikesrvm/mm/mminterface/GCMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java b/rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java
rename to rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java b/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/Handshake.java
rename to rvm/src/org/jikesrvm/mm/mminterface/Handshake.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java b/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
rename to rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManagerConstants.java b/rvm/src/org/jikesrvm/mm/mminterface/MemoryManagerConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/MemoryManagerConstants.java
rename to rvm/src/org/jikesrvm/mm/mminterface/MemoryManagerConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/Monitor.java b/rvm/src/org/jikesrvm/mm/mminterface/Monitor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/Monitor.java
rename to rvm/src/org/jikesrvm/mm/mminterface/Monitor.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/SpecializedScanMethod.java b/rvm/src/org/jikesrvm/mm/mminterface/SpecializedScanMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/SpecializedScanMethod.java
rename to rvm/src/org/jikesrvm/mm/mminterface/SpecializedScanMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java b/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java
rename to rvm/src/org/jikesrvm/mm/mminterface/SynchronizationBarrier.java
diff --git a/trunk/rvm/src/org/jikesrvm/mm/mminterface/ThreadContext.java b/rvm/src/org/jikesrvm/mm/mminterface/ThreadContext.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/mm/mminterface/ThreadContext.java
rename to rvm/src/org/jikesrvm/mm/mminterface/ThreadContext.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/BootImageInterface.java b/rvm/src/org/jikesrvm/objectmodel/BootImageInterface.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/BootImageInterface.java
rename to rvm/src/org/jikesrvm/objectmodel/BootImageInterface.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayout.java b/rvm/src/org/jikesrvm/objectmodel/FieldLayout.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayout.java
rename to rvm/src/org/jikesrvm/objectmodel/FieldLayout.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayoutContext.java b/rvm/src/org/jikesrvm/objectmodel/FieldLayoutContext.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayoutContext.java
rename to rvm/src/org/jikesrvm/objectmodel/FieldLayoutContext.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayoutPacked.java b/rvm/src/org/jikesrvm/objectmodel/FieldLayoutPacked.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayoutPacked.java
rename to rvm/src/org/jikesrvm/objectmodel/FieldLayoutPacked.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayoutUnpacked.java b/rvm/src/org/jikesrvm/objectmodel/FieldLayoutUnpacked.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/FieldLayoutUnpacked.java
rename to rvm/src/org/jikesrvm/objectmodel/FieldLayoutUnpacked.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/IMT.java b/rvm/src/org/jikesrvm/objectmodel/IMT.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/IMT.java
rename to rvm/src/org/jikesrvm/objectmodel/IMT.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/ITable.java b/rvm/src/org/jikesrvm/objectmodel/ITable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/ITable.java
rename to rvm/src/org/jikesrvm/objectmodel/ITable.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/ITableArray.java b/rvm/src/org/jikesrvm/objectmodel/ITableArray.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/ITableArray.java
rename to rvm/src/org/jikesrvm/objectmodel/ITableArray.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/JavaHeader.java b/rvm/src/org/jikesrvm/objectmodel/JavaHeader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/JavaHeader.java
rename to rvm/src/org/jikesrvm/objectmodel/JavaHeader.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/JavaHeaderConstants.java b/rvm/src/org/jikesrvm/objectmodel/JavaHeaderConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/JavaHeaderConstants.java
rename to rvm/src/org/jikesrvm/objectmodel/JavaHeaderConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/MiscHeader.java b/rvm/src/org/jikesrvm/objectmodel/MiscHeader.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/MiscHeader.java
rename to rvm/src/org/jikesrvm/objectmodel/MiscHeader.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/MiscHeaderConstants.java b/rvm/src/org/jikesrvm/objectmodel/MiscHeaderConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/MiscHeaderConstants.java
rename to rvm/src/org/jikesrvm/objectmodel/MiscHeaderConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/ObjectModel.java b/rvm/src/org/jikesrvm/objectmodel/ObjectModel.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/ObjectModel.java
rename to rvm/src/org/jikesrvm/objectmodel/ObjectModel.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/RuntimeTable.java b/rvm/src/org/jikesrvm/objectmodel/RuntimeTable.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/RuntimeTable.java
rename to rvm/src/org/jikesrvm/objectmodel/RuntimeTable.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/TIB.java b/rvm/src/org/jikesrvm/objectmodel/TIB.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/TIB.java
rename to rvm/src/org/jikesrvm/objectmodel/TIB.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/TIBLayoutConstants.java b/rvm/src/org/jikesrvm/objectmodel/TIBLayoutConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/TIBLayoutConstants.java
rename to rvm/src/org/jikesrvm/objectmodel/TIBLayoutConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/objectmodel/ThinLockConstants.java b/rvm/src/org/jikesrvm/objectmodel/ThinLockConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/objectmodel/ThinLockConstants.java
rename to rvm/src/org/jikesrvm/objectmodel/ThinLockConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/options/OptionSet.java b/rvm/src/org/jikesrvm/options/OptionSet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/options/OptionSet.java
rename to rvm/src/org/jikesrvm/options/OptionSet.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/AdjustBCIndexes.java b/rvm/src/org/jikesrvm/osr/AdjustBCIndexes.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/AdjustBCIndexes.java
rename to rvm/src/org/jikesrvm/osr/AdjustBCIndexes.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/BytecodeTraverser.java b/rvm/src/org/jikesrvm/osr/BytecodeTraverser.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/BytecodeTraverser.java
rename to rvm/src/org/jikesrvm/osr/BytecodeTraverser.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/EncodedOSRMap.java b/rvm/src/org/jikesrvm/osr/EncodedOSRMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/EncodedOSRMap.java
rename to rvm/src/org/jikesrvm/osr/EncodedOSRMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ExecutionState.java b/rvm/src/org/jikesrvm/osr/ExecutionState.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ExecutionState.java
rename to rvm/src/org/jikesrvm/osr/ExecutionState.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ExecutionStateExtractor.java b/rvm/src/org/jikesrvm/osr/ExecutionStateExtractor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ExecutionStateExtractor.java
rename to rvm/src/org/jikesrvm/osr/ExecutionStateExtractor.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/LocalRegPair.java b/rvm/src/org/jikesrvm/osr/LocalRegPair.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/LocalRegPair.java
rename to rvm/src/org/jikesrvm/osr/LocalRegPair.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/MethodVariables.java b/rvm/src/org/jikesrvm/osr/MethodVariables.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/MethodVariables.java
rename to rvm/src/org/jikesrvm/osr/MethodVariables.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/OSRConstants.java b/rvm/src/org/jikesrvm/osr/OSRConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/OSRConstants.java
rename to rvm/src/org/jikesrvm/osr/OSRConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/OSRMapIterator.java b/rvm/src/org/jikesrvm/osr/OSRMapIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/OSRMapIterator.java
rename to rvm/src/org/jikesrvm/osr/OSRMapIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/OSRProfiler.java b/rvm/src/org/jikesrvm/osr/OSRProfiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/OSRProfiler.java
rename to rvm/src/org/jikesrvm/osr/OSRProfiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ObjectHolder.java b/rvm/src/org/jikesrvm/osr/ObjectHolder.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ObjectHolder.java
rename to rvm/src/org/jikesrvm/osr/ObjectHolder.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/SpecialCompiler.java b/rvm/src/org/jikesrvm/osr/SpecialCompiler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/SpecialCompiler.java
rename to rvm/src/org/jikesrvm/osr/SpecialCompiler.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/TypeStack.java b/rvm/src/org/jikesrvm/osr/TypeStack.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/TypeStack.java
rename to rvm/src/org/jikesrvm/osr/TypeStack.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/VariableElement.java b/rvm/src/org/jikesrvm/osr/VariableElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/VariableElement.java
rename to rvm/src/org/jikesrvm/osr/VariableElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/VariableMap.java b/rvm/src/org/jikesrvm/osr/VariableMap.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/VariableMap.java
rename to rvm/src/org/jikesrvm/osr/VariableMap.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/VariableMapElement.java b/rvm/src/org/jikesrvm/osr/VariableMapElement.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/VariableMapElement.java
rename to rvm/src/org/jikesrvm/osr/VariableMapElement.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/AConstNull.java b/rvm/src/org/jikesrvm/osr/bytecodes/AConstNull.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/AConstNull.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/AConstNull.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/CheckCast.java b/rvm/src/org/jikesrvm/osr/bytecodes/CheckCast.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/CheckCast.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/CheckCast.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/DoubleStore.java b/rvm/src/org/jikesrvm/osr/bytecodes/DoubleStore.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/DoubleStore.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/DoubleStore.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/FloatStore.java b/rvm/src/org/jikesrvm/osr/bytecodes/FloatStore.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/FloatStore.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/FloatStore.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/Goto.java b/rvm/src/org/jikesrvm/osr/bytecodes/Goto.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/Goto.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/Goto.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/IntStore.java b/rvm/src/org/jikesrvm/osr/bytecodes/IntStore.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/IntStore.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/IntStore.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/InvokeCompiledMethod.java b/rvm/src/org/jikesrvm/osr/bytecodes/InvokeCompiledMethod.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/InvokeCompiledMethod.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/InvokeCompiledMethod.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/InvokeStatic.java b/rvm/src/org/jikesrvm/osr/bytecodes/InvokeStatic.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/InvokeStatic.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/InvokeStatic.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadDoubleConst.java b/rvm/src/org/jikesrvm/osr/bytecodes/LoadDoubleConst.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadDoubleConst.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LoadDoubleConst.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadFloatConst.java b/rvm/src/org/jikesrvm/osr/bytecodes/LoadFloatConst.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadFloatConst.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LoadFloatConst.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadIntConst.java b/rvm/src/org/jikesrvm/osr/bytecodes/LoadIntConst.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadIntConst.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LoadIntConst.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadLongConst.java b/rvm/src/org/jikesrvm/osr/bytecodes/LoadLongConst.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadLongConst.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LoadLongConst.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadRetAddrConst.java b/rvm/src/org/jikesrvm/osr/bytecodes/LoadRetAddrConst.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadRetAddrConst.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LoadRetAddrConst.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadWordConst.java b/rvm/src/org/jikesrvm/osr/bytecodes/LoadWordConst.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LoadWordConst.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LoadWordConst.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/LongStore.java b/rvm/src/org/jikesrvm/osr/bytecodes/LongStore.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/LongStore.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/LongStore.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/Nop.java b/rvm/src/org/jikesrvm/osr/bytecodes/Nop.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/Nop.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/Nop.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/ParamInitEnd.java b/rvm/src/org/jikesrvm/osr/bytecodes/ParamInitEnd.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/ParamInitEnd.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/ParamInitEnd.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/Pop.java b/rvm/src/org/jikesrvm/osr/bytecodes/Pop.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/Pop.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/Pop.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/PseudoBytecode.java b/rvm/src/org/jikesrvm/osr/bytecodes/PseudoBytecode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/PseudoBytecode.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/PseudoBytecode.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/bytecodes/RefStore.java b/rvm/src/org/jikesrvm/osr/bytecodes/RefStore.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/bytecodes/RefStore.java
rename to rvm/src/org/jikesrvm/osr/bytecodes/RefStore.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ia32/BaselineExecutionStateExtractor.java b/rvm/src/org/jikesrvm/osr/ia32/BaselineExecutionStateExtractor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ia32/BaselineExecutionStateExtractor.java
rename to rvm/src/org/jikesrvm/osr/ia32/BaselineExecutionStateExtractor.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ia32/CodeInstaller.java b/rvm/src/org/jikesrvm/osr/ia32/CodeInstaller.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ia32/CodeInstaller.java
rename to rvm/src/org/jikesrvm/osr/ia32/CodeInstaller.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ia32/OptExecutionStateExtractor.java b/rvm/src/org/jikesrvm/osr/ia32/OptExecutionStateExtractor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ia32/OptExecutionStateExtractor.java
rename to rvm/src/org/jikesrvm/osr/ia32/OptExecutionStateExtractor.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ia32/PostThreadSwitch.java b/rvm/src/org/jikesrvm/osr/ia32/PostThreadSwitch.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ia32/PostThreadSwitch.java
rename to rvm/src/org/jikesrvm/osr/ia32/PostThreadSwitch.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ia32/TempRegisters.java b/rvm/src/org/jikesrvm/osr/ia32/TempRegisters.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ia32/TempRegisters.java
rename to rvm/src/org/jikesrvm/osr/ia32/TempRegisters.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java b/rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java
rename to rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ppc/CodeInstaller.java b/rvm/src/org/jikesrvm/osr/ppc/CodeInstaller.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ppc/CodeInstaller.java
rename to rvm/src/org/jikesrvm/osr/ppc/CodeInstaller.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ppc/OptExecutionStateExtractor.java b/rvm/src/org/jikesrvm/osr/ppc/OptExecutionStateExtractor.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ppc/OptExecutionStateExtractor.java
rename to rvm/src/org/jikesrvm/osr/ppc/OptExecutionStateExtractor.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ppc/PostThreadSwitch.java b/rvm/src/org/jikesrvm/osr/ppc/PostThreadSwitch.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ppc/PostThreadSwitch.java
rename to rvm/src/org/jikesrvm/osr/ppc/PostThreadSwitch.java
diff --git a/trunk/rvm/src/org/jikesrvm/osr/ppc/TempRegisters.java b/rvm/src/org/jikesrvm/osr/ppc/TempRegisters.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/osr/ppc/TempRegisters.java
rename to rvm/src/org/jikesrvm/osr/ppc/TempRegisters.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/ArchConstants.java b/rvm/src/org/jikesrvm/ppc/ArchConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/ArchConstants.java
rename to rvm/src/org/jikesrvm/ppc/ArchConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/BaselineConstants.java b/rvm/src/org/jikesrvm/ppc/BaselineConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/BaselineConstants.java
rename to rvm/src/org/jikesrvm/ppc/BaselineConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/Code.java b/rvm/src/org/jikesrvm/ppc/Code.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/Code.java
rename to rvm/src/org/jikesrvm/ppc/Code.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/CodeArray.java b/rvm/src/org/jikesrvm/ppc/CodeArray.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/CodeArray.java
rename to rvm/src/org/jikesrvm/ppc/CodeArray.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/Disassembler.java b/rvm/src/org/jikesrvm/ppc/Disassembler.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/Disassembler.java
rename to rvm/src/org/jikesrvm/ppc/Disassembler.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/DynamicLinkerHelper.java b/rvm/src/org/jikesrvm/ppc/DynamicLinkerHelper.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/DynamicLinkerHelper.java
rename to rvm/src/org/jikesrvm/ppc/DynamicLinkerHelper.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/InterfaceMethodConflictResolver.java b/rvm/src/org/jikesrvm/ppc/InterfaceMethodConflictResolver.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/InterfaceMethodConflictResolver.java
rename to rvm/src/org/jikesrvm/ppc/InterfaceMethodConflictResolver.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/LazyCompilationTrampoline.java b/rvm/src/org/jikesrvm/ppc/LazyCompilationTrampoline.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/LazyCompilationTrampoline.java
rename to rvm/src/org/jikesrvm/ppc/LazyCompilationTrampoline.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/MachineCode.java b/rvm/src/org/jikesrvm/ppc/MachineCode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/MachineCode.java
rename to rvm/src/org/jikesrvm/ppc/MachineCode.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/MachineReflection.java b/rvm/src/org/jikesrvm/ppc/MachineReflection.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/MachineReflection.java
rename to rvm/src/org/jikesrvm/ppc/MachineReflection.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/MachineSpecificPowerPC.java b/rvm/src/org/jikesrvm/ppc/MachineSpecificPowerPC.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/MachineSpecificPowerPC.java
rename to rvm/src/org/jikesrvm/ppc/MachineSpecificPowerPC.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/MultianewarrayHelper.java b/rvm/src/org/jikesrvm/ppc/MultianewarrayHelper.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/MultianewarrayHelper.java
rename to rvm/src/org/jikesrvm/ppc/MultianewarrayHelper.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/OpcodeTab.java b/rvm/src/org/jikesrvm/ppc/OpcodeTab.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/OpcodeTab.java
rename to rvm/src/org/jikesrvm/ppc/OpcodeTab.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/OpcodeXX.java b/rvm/src/org/jikesrvm/ppc/OpcodeXX.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/OpcodeXX.java
rename to rvm/src/org/jikesrvm/ppc/OpcodeXX.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/OutOfLineMachineCode.java b/rvm/src/org/jikesrvm/ppc/OutOfLineMachineCode.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/OutOfLineMachineCode.java
rename to rvm/src/org/jikesrvm/ppc/OutOfLineMachineCode.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/RegisterConstants.java b/rvm/src/org/jikesrvm/ppc/RegisterConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/RegisterConstants.java
rename to rvm/src/org/jikesrvm/ppc/RegisterConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/Registers.java b/rvm/src/org/jikesrvm/ppc/Registers.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/Registers.java
rename to rvm/src/org/jikesrvm/ppc/Registers.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/StackframeLayoutConstants.java b/rvm/src/org/jikesrvm/ppc/StackframeLayoutConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/StackframeLayoutConstants.java
rename to rvm/src/org/jikesrvm/ppc/StackframeLayoutConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/ThreadLocalState.java b/rvm/src/org/jikesrvm/ppc/ThreadLocalState.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/ThreadLocalState.java
rename to rvm/src/org/jikesrvm/ppc/ThreadLocalState.java
diff --git a/trunk/rvm/src/org/jikesrvm/ppc/TrapConstants.java b/rvm/src/org/jikesrvm/ppc/TrapConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/ppc/TrapConstants.java
rename to rvm/src/org/jikesrvm/ppc/TrapConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/ArchEntrypoints.java b/rvm/src/org/jikesrvm/runtime/ArchEntrypoints.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/ArchEntrypoints.java
rename to rvm/src/org/jikesrvm/runtime/ArchEntrypoints.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/BootRecord.java b/rvm/src/org/jikesrvm/runtime/BootRecord.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/BootRecord.java
rename to rvm/src/org/jikesrvm/runtime/BootRecord.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java b/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
rename to rvm/src/org/jikesrvm/runtime/DynamicLibrary.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/DynamicLink.java b/rvm/src/org/jikesrvm/runtime/DynamicLink.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/DynamicLink.java
rename to rvm/src/org/jikesrvm/runtime/DynamicLink.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/DynamicLinker.java b/rvm/src/org/jikesrvm/runtime/DynamicLinker.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/DynamicLinker.java
rename to rvm/src/org/jikesrvm/runtime/DynamicLinker.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/EntrypointHelper.java b/rvm/src/org/jikesrvm/runtime/EntrypointHelper.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/EntrypointHelper.java
rename to rvm/src/org/jikesrvm/runtime/EntrypointHelper.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java b/rvm/src/org/jikesrvm/runtime/Entrypoints.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
rename to rvm/src/org/jikesrvm/runtime/Entrypoints.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/ExceptionDeliverer.java b/rvm/src/org/jikesrvm/runtime/ExceptionDeliverer.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/ExceptionDeliverer.java
rename to rvm/src/org/jikesrvm/runtime/ExceptionDeliverer.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/ExitStatus.java b/rvm/src/org/jikesrvm/runtime/ExitStatus.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/ExitStatus.java
rename to rvm/src/org/jikesrvm/runtime/ExitStatus.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/FileSystem.java b/rvm/src/org/jikesrvm/runtime/FileSystem.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/FileSystem.java
rename to rvm/src/org/jikesrvm/runtime/FileSystem.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/Magic.java b/rvm/src/org/jikesrvm/runtime/Magic.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/Magic.java
rename to rvm/src/org/jikesrvm/runtime/Magic.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/MagicNames.java b/rvm/src/org/jikesrvm/runtime/MagicNames.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/MagicNames.java
rename to rvm/src/org/jikesrvm/runtime/MagicNames.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/MathConstants.java b/rvm/src/org/jikesrvm/runtime/MathConstants.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/MathConstants.java
rename to rvm/src/org/jikesrvm/runtime/MathConstants.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/Memory.java b/rvm/src/org/jikesrvm/runtime/Memory.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/Memory.java
rename to rvm/src/org/jikesrvm/runtime/Memory.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/ObjectAddressRemapper.java b/rvm/src/org/jikesrvm/runtime/ObjectAddressRemapper.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/ObjectAddressRemapper.java
rename to rvm/src/org/jikesrvm/runtime/ObjectAddressRemapper.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/Reflection.java b/rvm/src/org/jikesrvm/runtime/Reflection.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/Reflection.java
rename to rvm/src/org/jikesrvm/runtime/Reflection.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/ReflectionBase.java b/rvm/src/org/jikesrvm/runtime/ReflectionBase.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/ReflectionBase.java
rename to rvm/src/org/jikesrvm/runtime/ReflectionBase.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java b/rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java
rename to rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/StackBrowser.java b/rvm/src/org/jikesrvm/runtime/StackBrowser.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/StackBrowser.java
rename to rvm/src/org/jikesrvm/runtime/StackBrowser.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/StackTrace.java b/rvm/src/org/jikesrvm/runtime/StackTrace.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/StackTrace.java
rename to rvm/src/org/jikesrvm/runtime/StackTrace.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/Statics.java b/rvm/src/org/jikesrvm/runtime/Statics.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/Statics.java
rename to rvm/src/org/jikesrvm/runtime/Statics.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/SysCall.java b/rvm/src/org/jikesrvm/runtime/SysCall.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/SysCall.java
rename to rvm/src/org/jikesrvm/runtime/SysCall.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/Time.java b/rvm/src/org/jikesrvm/runtime/Time.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/Time.java
rename to rvm/src/org/jikesrvm/runtime/Time.java
diff --git a/trunk/rvm/src/org/jikesrvm/runtime/TimeoutException.java b/rvm/src/org/jikesrvm/runtime/TimeoutException.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/runtime/TimeoutException.java
rename to rvm/src/org/jikesrvm/runtime/TimeoutException.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/FinalizerThread.java b/rvm/src/org/jikesrvm/scheduler/FinalizerThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/FinalizerThread.java
rename to rvm/src/org/jikesrvm/scheduler/FinalizerThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/HeavyCondLock.java b/rvm/src/org/jikesrvm/scheduler/HeavyCondLock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/HeavyCondLock.java
rename to rvm/src/org/jikesrvm/scheduler/HeavyCondLock.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/Latch.java b/rvm/src/org/jikesrvm/scheduler/Latch.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/Latch.java
rename to rvm/src/org/jikesrvm/scheduler/Latch.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/Lock.java b/rvm/src/org/jikesrvm/scheduler/Lock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/Lock.java
rename to rvm/src/org/jikesrvm/scheduler/Lock.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/MainThread.java b/rvm/src/org/jikesrvm/scheduler/MainThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/MainThread.java
rename to rvm/src/org/jikesrvm/scheduler/MainThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/NoYieldpointsCondLock.java b/rvm/src/org/jikesrvm/scheduler/NoYieldpointsCondLock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/NoYieldpointsCondLock.java
rename to rvm/src/org/jikesrvm/scheduler/NoYieldpointsCondLock.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/RVMThread.java b/rvm/src/org/jikesrvm/scheduler/RVMThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/RVMThread.java
rename to rvm/src/org/jikesrvm/scheduler/RVMThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/SoftLatch.java b/rvm/src/org/jikesrvm/scheduler/SoftLatch.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/SoftLatch.java
rename to rvm/src/org/jikesrvm/scheduler/SoftLatch.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/SpinLock.java b/rvm/src/org/jikesrvm/scheduler/SpinLock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/SpinLock.java
rename to rvm/src/org/jikesrvm/scheduler/SpinLock.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/Synchronization.java b/rvm/src/org/jikesrvm/scheduler/Synchronization.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/Synchronization.java
rename to rvm/src/org/jikesrvm/scheduler/Synchronization.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/ThinLock.java b/rvm/src/org/jikesrvm/scheduler/ThinLock.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/ThinLock.java
rename to rvm/src/org/jikesrvm/scheduler/ThinLock.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/ThreadQueue.java b/rvm/src/org/jikesrvm/scheduler/ThreadQueue.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/ThreadQueue.java
rename to rvm/src/org/jikesrvm/scheduler/ThreadQueue.java
diff --git a/trunk/rvm/src/org/jikesrvm/scheduler/TimerThread.java b/rvm/src/org/jikesrvm/scheduler/TimerThread.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/scheduler/TimerThread.java
rename to rvm/src/org/jikesrvm/scheduler/TimerThread.java
diff --git a/trunk/rvm/src/org/jikesrvm/tools/header_gen/GenArch.java b/rvm/src/org/jikesrvm/tools/header_gen/GenArch.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tools/header_gen/GenArch.java
rename to rvm/src/org/jikesrvm/tools/header_gen/GenArch.java
diff --git a/trunk/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ia32.java b/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ia32.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ia32.java
rename to rvm/src/org/jikesrvm/tools/header_gen/GenArch_ia32.java
diff --git a/trunk/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ppc.java b/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ppc.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tools/header_gen/GenArch_ppc.java
rename to rvm/src/org/jikesrvm/tools/header_gen/GenArch_ppc.java
diff --git a/trunk/rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java b/rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java
rename to rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java
diff --git a/trunk/rvm/src/org/jikesrvm/tools/header_gen/SortableField.java b/rvm/src/org/jikesrvm/tools/header_gen/SortableField.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tools/header_gen/SortableField.java
rename to rvm/src/org/jikesrvm/tools/header_gen/SortableField.java
diff --git a/trunk/rvm/src/org/jikesrvm/tools/oth/OptTestHarness.java b/rvm/src/org/jikesrvm/tools/oth/OptTestHarness.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tools/oth/OptTestHarness.java
rename to rvm/src/org/jikesrvm/tools/oth/OptTestHarness.java
diff --git a/trunk/rvm/src/org/jikesrvm/tuningfork/ChunkQueue.java b/rvm/src/org/jikesrvm/tuningfork/ChunkQueue.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tuningfork/ChunkQueue.java
rename to rvm/src/org/jikesrvm/tuningfork/ChunkQueue.java
diff --git a/trunk/rvm/src/org/jikesrvm/tuningfork/EventChunkQueue.java b/rvm/src/org/jikesrvm/tuningfork/EventChunkQueue.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tuningfork/EventChunkQueue.java
rename to rvm/src/org/jikesrvm/tuningfork/EventChunkQueue.java
diff --git a/trunk/rvm/src/org/jikesrvm/tuningfork/Feedlet.java b/rvm/src/org/jikesrvm/tuningfork/Feedlet.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tuningfork/Feedlet.java
rename to rvm/src/org/jikesrvm/tuningfork/Feedlet.java
diff --git a/trunk/rvm/src/org/jikesrvm/tuningfork/SpaceDescriptorChunk.java b/rvm/src/org/jikesrvm/tuningfork/SpaceDescriptorChunk.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tuningfork/SpaceDescriptorChunk.java
rename to rvm/src/org/jikesrvm/tuningfork/SpaceDescriptorChunk.java
diff --git a/trunk/rvm/src/org/jikesrvm/tuningfork/TraceEngine.java b/rvm/src/org/jikesrvm/tuningfork/TraceEngine.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/tuningfork/TraceEngine.java
rename to rvm/src/org/jikesrvm/tuningfork/TraceEngine.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/AbstractHashMapRVM.java b/rvm/src/org/jikesrvm/util/AbstractHashMapRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/AbstractHashMapRVM.java
rename to rvm/src/org/jikesrvm/util/AbstractHashMapRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/AbstractHashSetRVM.java b/rvm/src/org/jikesrvm/util/AbstractHashSetRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/AbstractHashSetRVM.java
rename to rvm/src/org/jikesrvm/util/AbstractHashSetRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/AddressInputStream.java b/rvm/src/org/jikesrvm/util/AddressInputStream.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/AddressInputStream.java
rename to rvm/src/org/jikesrvm/util/AddressInputStream.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/BitVector.java b/rvm/src/org/jikesrvm/util/BitVector.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/BitVector.java
rename to rvm/src/org/jikesrvm/util/BitVector.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/EmptyIterator.java b/rvm/src/org/jikesrvm/util/EmptyIterator.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/EmptyIterator.java
rename to rvm/src/org/jikesrvm/util/EmptyIterator.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/HashMapRVM.java b/rvm/src/org/jikesrvm/util/HashMapRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/HashMapRVM.java
rename to rvm/src/org/jikesrvm/util/HashMapRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/HashSetRVM.java b/rvm/src/org/jikesrvm/util/HashSetRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/HashSetRVM.java
rename to rvm/src/org/jikesrvm/util/HashSetRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/IdentityHashMapRVM.java b/rvm/src/org/jikesrvm/util/IdentityHashMapRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/IdentityHashMapRVM.java
rename to rvm/src/org/jikesrvm/util/IdentityHashMapRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/ImmutableEntryHashMapRVM.java b/rvm/src/org/jikesrvm/util/ImmutableEntryHashMapRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/ImmutableEntryHashMapRVM.java
rename to rvm/src/org/jikesrvm/util/ImmutableEntryHashMapRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/ImmutableEntryHashSetRVM.java b/rvm/src/org/jikesrvm/util/ImmutableEntryHashSetRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/ImmutableEntryHashSetRVM.java
rename to rvm/src/org/jikesrvm/util/ImmutableEntryHashSetRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/ImmutableEntryIdentityHashMapRVM.java b/rvm/src/org/jikesrvm/util/ImmutableEntryIdentityHashMapRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/ImmutableEntryIdentityHashMapRVM.java
rename to rvm/src/org/jikesrvm/util/ImmutableEntryIdentityHashMapRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/LinkedListIteratorRVM.java b/rvm/src/org/jikesrvm/util/LinkedListIteratorRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/LinkedListIteratorRVM.java
rename to rvm/src/org/jikesrvm/util/LinkedListIteratorRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/LinkedListRVM.java b/rvm/src/org/jikesrvm/util/LinkedListRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/LinkedListRVM.java
rename to rvm/src/org/jikesrvm/util/LinkedListRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/Pair.java b/rvm/src/org/jikesrvm/util/Pair.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/Pair.java
rename to rvm/src/org/jikesrvm/util/Pair.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/PriorityQueueRVM.java b/rvm/src/org/jikesrvm/util/PriorityQueueRVM.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/PriorityQueueRVM.java
rename to rvm/src/org/jikesrvm/util/PriorityQueueRVM.java
diff --git a/trunk/rvm/src/org/jikesrvm/util/StringUtilities.java b/rvm/src/org/jikesrvm/util/StringUtilities.java
similarity index 100%
rename from trunk/rvm/src/org/jikesrvm/util/StringUtilities.java
rename to rvm/src/org/jikesrvm/util/StringUtilities.java
diff --git a/trunk/test.xml b/test.xml
similarity index 100%
rename from trunk/test.xml
rename to test.xml
diff --git a/trunk/testing/tests/CaffeineMark/build.xml b/testing/tests/CaffeineMark/build.xml
similarity index 100%
rename from trunk/testing/tests/CaffeineMark/build.xml
rename to testing/tests/CaffeineMark/build.xml
diff --git a/trunk/testing/tests/CaffeineMark/src/RunCaffeine.java b/testing/tests/CaffeineMark/src/RunCaffeine.java
similarity index 100%
rename from trunk/testing/tests/CaffeineMark/src/RunCaffeine.java
rename to testing/tests/CaffeineMark/src/RunCaffeine.java
diff --git a/trunk/testing/tests/SPECjbb2000/SPECjbb.night.props b/testing/tests/SPECjbb2000/SPECjbb.night.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/SPECjbb.night.props
rename to testing/tests/SPECjbb2000/SPECjbb.night.props
diff --git a/trunk/testing/tests/SPECjbb2000/SPECjbb.perf.props b/testing/tests/SPECjbb2000/SPECjbb.perf.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/SPECjbb.perf.props
rename to testing/tests/SPECjbb2000/SPECjbb.perf.props
diff --git a/trunk/testing/tests/SPECjbb2000/SPECjbb.sanity.props b/testing/tests/SPECjbb2000/SPECjbb.sanity.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/SPECjbb.sanity.props
rename to testing/tests/SPECjbb2000/SPECjbb.sanity.props
diff --git a/trunk/testing/tests/SPECjbb2000/SPECjbb_1.1.1.props b/testing/tests/SPECjbb2000/SPECjbb_1.1.1.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/SPECjbb_1.1.1.props
rename to testing/tests/SPECjbb2000/SPECjbb_1.1.1.props
diff --git a/trunk/testing/tests/SPECjbb2000/SPECjbb_4.4.4.props b/testing/tests/SPECjbb2000/SPECjbb_4.4.4.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/SPECjbb_4.4.4.props
rename to testing/tests/SPECjbb2000/SPECjbb_4.4.4.props
diff --git a/trunk/testing/tests/SPECjbb2000/SPECjbb_config.props b/testing/tests/SPECjbb2000/SPECjbb_config.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/SPECjbb_config.props
rename to testing/tests/SPECjbb2000/SPECjbb_config.props
diff --git a/trunk/testing/tests/SPECjbb2000/build.xml b/testing/tests/SPECjbb2000/build.xml
similarity index 100%
rename from trunk/testing/tests/SPECjbb2000/build.xml
rename to testing/tests/SPECjbb2000/build.xml
diff --git a/trunk/testing/tests/SPECjbb2005/SPECjbb.props b/testing/tests/SPECjbb2005/SPECjbb.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2005/SPECjbb.props
rename to testing/tests/SPECjbb2005/SPECjbb.props
diff --git a/trunk/testing/tests/SPECjbb2005/SPECjbb.sanity.props b/testing/tests/SPECjbb2005/SPECjbb.sanity.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2005/SPECjbb.sanity.props
rename to testing/tests/SPECjbb2005/SPECjbb.sanity.props
diff --git a/trunk/testing/tests/SPECjbb2005/SPECjbb_config.props b/testing/tests/SPECjbb2005/SPECjbb_config.props
similarity index 100%
rename from trunk/testing/tests/SPECjbb2005/SPECjbb_config.props
rename to testing/tests/SPECjbb2005/SPECjbb_config.props
diff --git a/trunk/testing/tests/SPECjbb2005/build.xml b/testing/tests/SPECjbb2005/build.xml
similarity index 100%
rename from trunk/testing/tests/SPECjbb2005/build.xml
rename to testing/tests/SPECjbb2005/build.xml
diff --git a/trunk/testing/tests/SPECjvm2008/build.xml b/testing/tests/SPECjvm2008/build.xml
similarity index 100%
rename from trunk/testing/tests/SPECjvm2008/build.xml
rename to testing/tests/SPECjvm2008/build.xml
diff --git a/trunk/testing/tests/SPECjvm98/build.xml b/testing/tests/SPECjvm98/build.xml
similarity index 100%
rename from trunk/testing/tests/SPECjvm98/build.xml
rename to testing/tests/SPECjvm98/build.xml
diff --git a/trunk/testing/tests/SPECjvm98/parseSPECmark b/testing/tests/SPECjvm98/parseSPECmark
similarity index 100%
rename from trunk/testing/tests/SPECjvm98/parseSPECmark
rename to testing/tests/SPECjvm98/parseSPECmark
diff --git a/trunk/testing/tests/SPECjvm98/parse_spec b/testing/tests/SPECjvm98/parse_spec
similarity index 100%
rename from trunk/testing/tests/SPECjvm98/parse_spec
rename to testing/tests/SPECjvm98/parse_spec
diff --git a/trunk/testing/tests/SPECjvm98/parse_spec_min b/testing/tests/SPECjvm98/parse_spec_min
similarity index 100%
rename from trunk/testing/tests/SPECjvm98/parse_spec_min
rename to testing/tests/SPECjvm98/parse_spec_min
diff --git a/trunk/testing/tests/SPECjvm98/run.bash b/testing/tests/SPECjvm98/run.bash
similarity index 100%
rename from trunk/testing/tests/SPECjvm98/run.bash
rename to testing/tests/SPECjvm98/run.bash
diff --git a/trunk/testing/tests/SPECjvm98/specmark.reference b/testing/tests/SPECjvm98/specmark.reference
similarity index 100%
rename from trunk/testing/tests/SPECjvm98/specmark.reference
rename to testing/tests/SPECjvm98/specmark.reference
diff --git a/trunk/testing/tests/basic/build.xml b/testing/tests/basic/build.xml
similarity index 100%
rename from trunk/testing/tests/basic/build.xml
rename to testing/tests/basic/build.xml
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644449.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1644460_B.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1657236.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/R1722506.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_550.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.java b/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/bugs/RVM_708.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotationInheritance.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/annotation/TestAnnotations.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArithmetic.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestArrayAccess.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassHierarchy.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClassInitializer.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestClone.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestCompare.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestConstants.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFieldAccess.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFinally.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestFloatingRem.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInstanceOf.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestInvoke.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestMiranda.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnCheckcast.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInstanceof.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestResolveOnInvokeInterface.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestReturn.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestSwitch.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/TestThrownException.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/SubClassInDifferentPackage.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/SubClassInDifferentPackage.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/SubClassInDifferentPackage.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/bytecode/data/SubClassInDifferentPackage.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestClassLoading.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestLoadingWithoutName.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/classloading/TestUTF8.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/AgentX.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/AgentX.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/AgentX.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/AgentX.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/instrument/TestAgent.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/TestFieldReflection.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tArray.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tClass.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tInstance.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/reflect/tNewInstance.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.dat b/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.dat
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.dat
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.dat
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/SerializationData.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/serialization/TestSerialization.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Flag.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Flag.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Flag.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Flag.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Mailbox.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Mailbox.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Mailbox.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Mailbox.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Task.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Task.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Task.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/Task.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestBackEdgeGC.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestDispatch.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptAndSpin.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedSleep2.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestInterruptedWait.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestNotification.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestParallelHardwareTrap.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHook.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestShutdownHookAfterExit.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestStop.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestSuspend.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimeSlicing.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestTimedWait.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/TestVolatiles.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/XThread.java b/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/XThread.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/XThread.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/core/threads/XThread.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.java b/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/java/lang/TestMath.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.expected b/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.expected
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.expected
rename to testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.expected
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.java b/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/java/nio/TestFileChannel.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/stats/JikesImageSizes.java b/testing/tests/basic/src/test/org/jikesrvm/basic/stats/JikesImageSizes.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/stats/JikesImageSizes.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/stats/JikesImageSizes.java
diff --git a/trunk/testing/tests/basic/src/test/org/jikesrvm/basic/util/IdentityClassFileTransformer.java b/testing/tests/basic/src/test/org/jikesrvm/basic/util/IdentityClassFileTransformer.java
similarity index 100%
rename from trunk/testing/tests/basic/src/test/org/jikesrvm/basic/util/IdentityClassFileTransformer.java
rename to testing/tests/basic/src/test/org/jikesrvm/basic/util/IdentityClassFileTransformer.java
diff --git a/trunk/testing/tests/classpath-testsuite/build.xml b/testing/tests/classpath-testsuite/build.xml
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/build.xml
rename to testing/tests/classpath-testsuite/build.xml
diff --git a/trunk/testing/tests/classpath-testsuite/expected/ArrayTest.expected b/testing/tests/classpath-testsuite/expected/ArrayTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/ArrayTest.expected
rename to testing/tests/classpath-testsuite/expected/ArrayTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/BooleanTest.expected b/testing/tests/classpath-testsuite/expected/BooleanTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/BooleanTest.expected
rename to testing/tests/classpath-testsuite/expected/BooleanTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/CastTest.expected b/testing/tests/classpath-testsuite/expected/CastTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/CastTest.expected
rename to testing/tests/classpath-testsuite/expected/CastTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected b/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/ClassForNameTest.expected
rename to testing/tests/classpath-testsuite/expected/ClassForNameTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected b/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected
rename to testing/tests/classpath-testsuite/expected/DatagramSocketTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/ExceptionTest.expected b/testing/tests/classpath-testsuite/expected/ExceptionTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/ExceptionTest.expected
rename to testing/tests/classpath-testsuite/expected/ExceptionTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected b/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected
rename to testing/tests/classpath-testsuite/expected/FloatingDecimalTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/JoinTest.expected b/testing/tests/classpath-testsuite/expected/JoinTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/JoinTest.expected
rename to testing/tests/classpath-testsuite/expected/JoinTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/LongFieldTest.expected b/testing/tests/classpath-testsuite/expected/LongFieldTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/LongFieldTest.expected
rename to testing/tests/classpath-testsuite/expected/LongFieldTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected b/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/MessageFormatTest.expected
rename to testing/tests/classpath-testsuite/expected/MessageFormatTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected b/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/NewInstanceTest.expected
rename to testing/tests/classpath-testsuite/expected/NewInstanceTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/NullcastTest.expected b/testing/tests/classpath-testsuite/expected/NullcastTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/NullcastTest.expected
rename to testing/tests/classpath-testsuite/expected/NullcastTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected b/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected
rename to testing/tests/classpath-testsuite/expected/OutOfMemoryErrorTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected b/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected
rename to testing/tests/classpath-testsuite/expected/RandomAccessFileTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected b/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected
rename to testing/tests/classpath-testsuite/expected/SimpleDateFormatTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected b/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected
rename to testing/tests/classpath-testsuite/expected/SimpleTimeZoneTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected b/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected
rename to testing/tests/classpath-testsuite/expected/SocketSendReceiveTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/SocketTest.expected b/testing/tests/classpath-testsuite/expected/SocketTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/SocketTest.expected
rename to testing/tests/classpath-testsuite/expected/SocketTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/StringTest.expected b/testing/tests/classpath-testsuite/expected/StringTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/StringTest.expected
rename to testing/tests/classpath-testsuite/expected/StringTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected b/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/SyncronizedTest.expected
rename to testing/tests/classpath-testsuite/expected/SyncronizedTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/ThreadTest.expected b/testing/tests/classpath-testsuite/expected/ThreadTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/ThreadTest.expected
rename to testing/tests/classpath-testsuite/expected/ThreadTest.expected
diff --git a/trunk/testing/tests/classpath-testsuite/expected/URLTest.expected b/testing/tests/classpath-testsuite/expected/URLTest.expected
similarity index 100%
rename from trunk/testing/tests/classpath-testsuite/expected/URLTest.expected
rename to testing/tests/classpath-testsuite/expected/URLTest.expected
diff --git a/trunk/testing/tests/dacapo-head/build.xml b/testing/tests/dacapo-head/build.xml
similarity index 100%
rename from trunk/testing/tests/dacapo-head/build.xml
rename to testing/tests/dacapo-head/build.xml
diff --git a/trunk/testing/tests/dacapo/build.xml b/testing/tests/dacapo/build.xml
similarity index 100%
rename from trunk/testing/tests/dacapo/build.xml
rename to testing/tests/dacapo/build.xml
diff --git a/trunk/testing/tests/gctest/build.xml b/testing/tests/gctest/build.xml
similarity index 100%
rename from trunk/testing/tests/gctest/build.xml
rename to testing/tests/gctest/build.xml
diff --git a/trunk/testing/tests/gctest/src/Exhaust.java b/testing/tests/gctest/src/Exhaust.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/Exhaust.java
rename to testing/tests/gctest/src/Exhaust.java
diff --git a/trunk/testing/tests/gctest/src/FixedLive.java b/testing/tests/gctest/src/FixedLive.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/FixedLive.java
rename to testing/tests/gctest/src/FixedLive.java
diff --git a/trunk/testing/tests/gctest/src/InlineAllocation.java b/testing/tests/gctest/src/InlineAllocation.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/InlineAllocation.java
rename to testing/tests/gctest/src/InlineAllocation.java
diff --git a/trunk/testing/tests/gctest/src/LargeAlloc.java b/testing/tests/gctest/src/LargeAlloc.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/LargeAlloc.java
rename to testing/tests/gctest/src/LargeAlloc.java
diff --git a/trunk/testing/tests/gctest/src/Node2I2A.java b/testing/tests/gctest/src/Node2I2A.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/Node2I2A.java
rename to testing/tests/gctest/src/Node2I2A.java
diff --git a/trunk/testing/tests/gctest/src/ReferenceStress.java b/testing/tests/gctest/src/ReferenceStress.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/ReferenceStress.java
rename to testing/tests/gctest/src/ReferenceStress.java
diff --git a/trunk/testing/tests/gctest/src/ReferenceTest.java b/testing/tests/gctest/src/ReferenceTest.java
similarity index 100%
rename from trunk/testing/tests/gctest/src/ReferenceTest.java
rename to testing/tests/gctest/src/ReferenceTest.java
diff --git a/trunk/testing/tests/gctracingtest/build.xml b/testing/tests/gctracingtest/build.xml
similarity index 100%
rename from trunk/testing/tests/gctracingtest/build.xml
rename to testing/tests/gctracingtest/build.xml
diff --git a/trunk/testing/tests/gctracingtest/src/TracingTest.java b/testing/tests/gctracingtest/src/TracingTest.java
similarity index 100%
rename from trunk/testing/tests/gctracingtest/src/TracingTest.java
rename to testing/tests/gctracingtest/src/TracingTest.java
diff --git a/trunk/testing/tests/ipsixql/build.xml b/testing/tests/ipsixql/build.xml
similarity index 100%
rename from trunk/testing/tests/ipsixql/build.xml
rename to testing/tests/ipsixql/build.xml
diff --git a/trunk/testing/tests/jBYTEmark/build.xml b/testing/tests/jBYTEmark/build.xml
similarity index 100%
rename from trunk/testing/tests/jBYTEmark/build.xml
rename to testing/tests/jBYTEmark/build.xml
diff --git a/trunk/testing/tests/javalex/build.xml b/testing/tests/javalex/build.xml
similarity index 100%
rename from trunk/testing/tests/javalex/build.xml
rename to testing/tests/javalex/build.xml
diff --git a/trunk/testing/tests/javalex/qb1.lex.ref.classpath b/testing/tests/javalex/qb1.lex.ref.classpath
similarity index 100%
rename from trunk/testing/tests/javalex/qb1.lex.ref.classpath
rename to testing/tests/javalex/qb1.lex.ref.classpath
diff --git a/trunk/testing/tests/jgf-threads/build.xml b/testing/tests/jgf-threads/build.xml
similarity index 100%
rename from trunk/testing/tests/jgf-threads/build.xml
rename to testing/tests/jgf-threads/build.xml
diff --git a/trunk/testing/tests/jgf-threads/src/JGF_MultithreadedBenchmark.java b/testing/tests/jgf-threads/src/JGF_MultithreadedBenchmark.java
similarity index 100%
rename from trunk/testing/tests/jgf-threads/src/JGF_MultithreadedBenchmark.java
rename to testing/tests/jgf-threads/src/JGF_MultithreadedBenchmark.java
diff --git a/trunk/testing/tests/jgf/build.xml b/testing/tests/jgf/build.xml
similarity index 100%
rename from trunk/testing/tests/jgf/build.xml
rename to testing/tests/jgf/build.xml
diff --git a/trunk/testing/tests/jgf/src/JGF_SerialBenchmark.java b/testing/tests/jgf/src/JGF_SerialBenchmark.java
similarity index 100%
rename from trunk/testing/tests/jgf/src/JGF_SerialBenchmark.java
rename to testing/tests/jgf/src/JGF_SerialBenchmark.java
diff --git a/trunk/testing/tests/jni/build.xml b/testing/tests/jni/build.xml
similarity index 100%
rename from trunk/testing/tests/jni/build.xml
rename to testing/tests/jni/build.xml
diff --git a/trunk/testing/tests/jni/src/Allocation.c b/testing/tests/jni/src/Allocation.c
similarity index 100%
rename from trunk/testing/tests/jni/src/Allocation.c
rename to testing/tests/jni/src/Allocation.c
diff --git a/trunk/testing/tests/jni/src/Allocation.java b/testing/tests/jni/src/Allocation.java
similarity index 100%
rename from trunk/testing/tests/jni/src/Allocation.java
rename to testing/tests/jni/src/Allocation.java
diff --git a/trunk/testing/tests/jni/src/ArgumentPassing.c b/testing/tests/jni/src/ArgumentPassing.c
similarity index 100%
rename from trunk/testing/tests/jni/src/ArgumentPassing.c
rename to testing/tests/jni/src/ArgumentPassing.c
diff --git a/trunk/testing/tests/jni/src/ArgumentPassing.java b/testing/tests/jni/src/ArgumentPassing.java
similarity index 100%
rename from trunk/testing/tests/jni/src/ArgumentPassing.java
rename to testing/tests/jni/src/ArgumentPassing.java
diff --git a/trunk/testing/tests/jni/src/ArrayFunctions.c b/testing/tests/jni/src/ArrayFunctions.c
similarity index 100%
rename from trunk/testing/tests/jni/src/ArrayFunctions.c
rename to testing/tests/jni/src/ArrayFunctions.c
diff --git a/trunk/testing/tests/jni/src/ArrayFunctions.java b/testing/tests/jni/src/ArrayFunctions.java
similarity index 100%
rename from trunk/testing/tests/jni/src/ArrayFunctions.java
rename to testing/tests/jni/src/ArrayFunctions.java
diff --git a/trunk/testing/tests/jni/src/AttachJVM.c b/testing/tests/jni/src/AttachJVM.c
similarity index 100%
rename from trunk/testing/tests/jni/src/AttachJVM.c
rename to testing/tests/jni/src/AttachJVM.c
diff --git a/trunk/testing/tests/jni/src/BlockingThreadsWorker.java b/testing/tests/jni/src/BlockingThreadsWorker.java
similarity index 100%
rename from trunk/testing/tests/jni/src/BlockingThreadsWorker.java
rename to testing/tests/jni/src/BlockingThreadsWorker.java
diff --git a/trunk/testing/tests/jni/src/BlockingWorker.java b/testing/tests/jni/src/BlockingWorker.java
similarity index 100%
rename from trunk/testing/tests/jni/src/BlockingWorker.java
rename to testing/tests/jni/src/BlockingWorker.java
diff --git a/trunk/testing/tests/jni/src/ClassQuery.c b/testing/tests/jni/src/ClassQuery.c
similarity index 100%
rename from trunk/testing/tests/jni/src/ClassQuery.c
rename to testing/tests/jni/src/ClassQuery.c
diff --git a/trunk/testing/tests/jni/src/ClassQuery.java b/testing/tests/jni/src/ClassQuery.java
similarity index 100%
rename from trunk/testing/tests/jni/src/ClassQuery.java
rename to testing/tests/jni/src/ClassQuery.java
diff --git a/trunk/testing/tests/jni/src/ClassQuerySuper.java b/testing/tests/jni/src/ClassQuerySuper.java
similarity index 100%
rename from trunk/testing/tests/jni/src/ClassQuerySuper.java
rename to testing/tests/jni/src/ClassQuerySuper.java
diff --git a/trunk/testing/tests/jni/src/CriticalCopy.c b/testing/tests/jni/src/CriticalCopy.c
similarity index 100%
rename from trunk/testing/tests/jni/src/CriticalCopy.c
rename to testing/tests/jni/src/CriticalCopy.c
diff --git a/trunk/testing/tests/jni/src/CriticalCopy.java b/testing/tests/jni/src/CriticalCopy.java
similarity index 100%
rename from trunk/testing/tests/jni/src/CriticalCopy.java
rename to testing/tests/jni/src/CriticalCopy.java
diff --git a/trunk/testing/tests/jni/src/FieldAccess.c b/testing/tests/jni/src/FieldAccess.c
similarity index 100%
rename from trunk/testing/tests/jni/src/FieldAccess.c
rename to testing/tests/jni/src/FieldAccess.c
diff --git a/trunk/testing/tests/jni/src/FieldAccess.java b/testing/tests/jni/src/FieldAccess.java
similarity index 100%
rename from trunk/testing/tests/jni/src/FieldAccess.java
rename to testing/tests/jni/src/FieldAccess.java
diff --git a/trunk/testing/tests/jni/src/GetEnv.c b/testing/tests/jni/src/GetEnv.c
similarity index 100%
rename from trunk/testing/tests/jni/src/GetEnv.c
rename to testing/tests/jni/src/GetEnv.c
diff --git a/trunk/testing/tests/jni/src/GetEnv.h b/testing/tests/jni/src/GetEnv.h
similarity index 100%
rename from trunk/testing/tests/jni/src/GetEnv.h
rename to testing/tests/jni/src/GetEnv.h
diff --git a/trunk/testing/tests/jni/src/GetEnv.java b/testing/tests/jni/src/GetEnv.java
similarity index 100%
rename from trunk/testing/tests/jni/src/GetEnv.java
rename to testing/tests/jni/src/GetEnv.java
diff --git a/trunk/testing/tests/jni/src/JNI12.c b/testing/tests/jni/src/JNI12.c
similarity index 100%
rename from trunk/testing/tests/jni/src/JNI12.c
rename to testing/tests/jni/src/JNI12.c
diff --git a/trunk/testing/tests/jni/src/JNI12.java b/testing/tests/jni/src/JNI12.java
similarity index 100%
rename from trunk/testing/tests/jni/src/JNI12.java
rename to testing/tests/jni/src/JNI12.java
diff --git a/trunk/testing/tests/jni/src/JNI_OnLoad.c b/testing/tests/jni/src/JNI_OnLoad.c
similarity index 100%
rename from trunk/testing/tests/jni/src/JNI_OnLoad.c
rename to testing/tests/jni/src/JNI_OnLoad.c
diff --git a/trunk/testing/tests/jni/src/JNI_OnLoad.java b/testing/tests/jni/src/JNI_OnLoad.java
similarity index 100%
rename from trunk/testing/tests/jni/src/JNI_OnLoad.java
rename to testing/tests/jni/src/JNI_OnLoad.java
diff --git a/trunk/testing/tests/jni/src/Mangled_Name_s_.c b/testing/tests/jni/src/Mangled_Name_s_.c
similarity index 100%
rename from trunk/testing/tests/jni/src/Mangled_Name_s_.c
rename to testing/tests/jni/src/Mangled_Name_s_.c
diff --git a/trunk/testing/tests/jni/src/Mangled_Name_s_.java b/testing/tests/jni/src/Mangled_Name_s_.java
similarity index 100%
rename from trunk/testing/tests/jni/src/Mangled_Name_s_.java
rename to testing/tests/jni/src/Mangled_Name_s_.java
diff --git a/trunk/testing/tests/jni/src/MethodInvocation.c b/testing/tests/jni/src/MethodInvocation.c
similarity index 100%
rename from trunk/testing/tests/jni/src/MethodInvocation.c
rename to testing/tests/jni/src/MethodInvocation.c
diff --git a/trunk/testing/tests/jni/src/MethodInvocation.java b/testing/tests/jni/src/MethodInvocation.java
similarity index 100%
rename from trunk/testing/tests/jni/src/MethodInvocation.java
rename to testing/tests/jni/src/MethodInvocation.java
diff --git a/trunk/testing/tests/jni/src/MethodInvocationSub.java b/testing/tests/jni/src/MethodInvocationSub.java
similarity index 100%
rename from trunk/testing/tests/jni/src/MethodInvocationSub.java
rename to testing/tests/jni/src/MethodInvocationSub.java
diff --git a/trunk/testing/tests/jni/src/MonitorTest.c b/testing/tests/jni/src/MonitorTest.c
similarity index 100%
rename from trunk/testing/tests/jni/src/MonitorTest.c
rename to testing/tests/jni/src/MonitorTest.c
diff --git a/trunk/testing/tests/jni/src/MonitorTest.java b/testing/tests/jni/src/MonitorTest.java
similarity index 100%
rename from trunk/testing/tests/jni/src/MonitorTest.java
rename to testing/tests/jni/src/MonitorTest.java
diff --git a/trunk/testing/tests/jni/src/NativeException.c b/testing/tests/jni/src/NativeException.c
similarity index 100%
rename from trunk/testing/tests/jni/src/NativeException.c
rename to testing/tests/jni/src/NativeException.c
diff --git a/trunk/testing/tests/jni/src/NativeException.java b/testing/tests/jni/src/NativeException.java
similarity index 100%
rename from trunk/testing/tests/jni/src/NativeException.java
rename to testing/tests/jni/src/NativeException.java
diff --git a/trunk/testing/tests/jni/src/NativeThreadsWorker.java b/testing/tests/jni/src/NativeThreadsWorker.java
similarity index 100%
rename from trunk/testing/tests/jni/src/NativeThreadsWorker.java
rename to testing/tests/jni/src/NativeThreadsWorker.java
diff --git a/trunk/testing/tests/jni/src/NullIdentity.c b/testing/tests/jni/src/NullIdentity.c
similarity index 100%
rename from trunk/testing/tests/jni/src/NullIdentity.c
rename to testing/tests/jni/src/NullIdentity.c
diff --git a/trunk/testing/tests/jni/src/NullIdentity.java b/testing/tests/jni/src/NullIdentity.java
similarity index 100%
rename from trunk/testing/tests/jni/src/NullIdentity.java
rename to testing/tests/jni/src/NullIdentity.java
diff --git a/trunk/testing/tests/jni/src/SelectTest.c b/testing/tests/jni/src/SelectTest.c
similarity index 100%
rename from trunk/testing/tests/jni/src/SelectTest.c
rename to testing/tests/jni/src/SelectTest.c
diff --git a/trunk/testing/tests/jni/src/SelectTest.java b/testing/tests/jni/src/SelectTest.java
similarity index 100%
rename from trunk/testing/tests/jni/src/SelectTest.java
rename to testing/tests/jni/src/SelectTest.java
diff --git a/trunk/testing/tests/jni/src/StackResize.c b/testing/tests/jni/src/StackResize.c
similarity index 100%
rename from trunk/testing/tests/jni/src/StackResize.c
rename to testing/tests/jni/src/StackResize.c
diff --git a/trunk/testing/tests/jni/src/StackResize.java b/testing/tests/jni/src/StackResize.java
similarity index 100%
rename from trunk/testing/tests/jni/src/StackResize.java
rename to testing/tests/jni/src/StackResize.java
diff --git a/trunk/testing/tests/jni/src/StringFunctions.c b/testing/tests/jni/src/StringFunctions.c
similarity index 100%
rename from trunk/testing/tests/jni/src/StringFunctions.c
rename to testing/tests/jni/src/StringFunctions.c
diff --git a/trunk/testing/tests/jni/src/StringFunctions.java b/testing/tests/jni/src/StringFunctions.java
similarity index 100%
rename from trunk/testing/tests/jni/src/StringFunctions.java
rename to testing/tests/jni/src/StringFunctions.java
diff --git a/trunk/testing/tests/jni/src/StringRegion.c b/testing/tests/jni/src/StringRegion.c
similarity index 100%
rename from trunk/testing/tests/jni/src/StringRegion.c
rename to testing/tests/jni/src/StringRegion.c
diff --git a/trunk/testing/tests/jni/src/StringRegion.java b/testing/tests/jni/src/StringRegion.java
similarity index 100%
rename from trunk/testing/tests/jni/src/StringRegion.java
rename to testing/tests/jni/src/StringRegion.java
diff --git a/trunk/testing/tests/jni/src/TestDeadVPQueue.java b/testing/tests/jni/src/TestDeadVPQueue.java
similarity index 100%
rename from trunk/testing/tests/jni/src/TestDeadVPQueue.java
rename to testing/tests/jni/src/TestDeadVPQueue.java
diff --git a/trunk/testing/tests/jni/src/TestDeadVPQueueWorker.c b/testing/tests/jni/src/TestDeadVPQueueWorker.c
similarity index 100%
rename from trunk/testing/tests/jni/src/TestDeadVPQueueWorker.c
rename to testing/tests/jni/src/TestDeadVPQueueWorker.c
diff --git a/trunk/testing/tests/jni/src/TestDeadVPQueueWorker.java b/testing/tests/jni/src/TestDeadVPQueueWorker.java
similarity index 100%
rename from trunk/testing/tests/jni/src/TestDeadVPQueueWorker.java
rename to testing/tests/jni/src/TestDeadVPQueueWorker.java
diff --git a/trunk/testing/tests/jni/src/TestGC.c b/testing/tests/jni/src/TestGC.c
similarity index 100%
rename from trunk/testing/tests/jni/src/TestGC.c
rename to testing/tests/jni/src/TestGC.c
diff --git a/trunk/testing/tests/jni/src/TestGC.java b/testing/tests/jni/src/TestGC.java
similarity index 100%
rename from trunk/testing/tests/jni/src/TestGC.java
rename to testing/tests/jni/src/TestGC.java
diff --git a/trunk/testing/tests/jni/src/TestJNIDirectBuffers.c b/testing/tests/jni/src/TestJNIDirectBuffers.c
similarity index 100%
rename from trunk/testing/tests/jni/src/TestJNIDirectBuffers.c
rename to testing/tests/jni/src/TestJNIDirectBuffers.c
diff --git a/trunk/testing/tests/jni/src/TestJNIDirectBuffers.java b/testing/tests/jni/src/TestJNIDirectBuffers.java
similarity index 100%
rename from trunk/testing/tests/jni/src/TestJNIDirectBuffers.java
rename to testing/tests/jni/src/TestJNIDirectBuffers.java
diff --git a/trunk/testing/tests/jni/src/TestProcessDestroy.java b/testing/tests/jni/src/TestProcessDestroy.java
similarity index 100%
rename from trunk/testing/tests/jni/src/TestProcessDestroy.java
rename to testing/tests/jni/src/TestProcessDestroy.java
diff --git a/trunk/testing/tests/jni/src/TestRuntimeExec.java b/testing/tests/jni/src/TestRuntimeExec.java
similarity index 100%
rename from trunk/testing/tests/jni/src/TestRuntimeExec.java
rename to testing/tests/jni/src/TestRuntimeExec.java
diff --git a/trunk/testing/tests/jni/src/Worker.java b/testing/tests/jni/src/Worker.java
similarity index 100%
rename from trunk/testing/tests/jni/src/Worker.java
rename to testing/tests/jni/src/Worker.java
diff --git a/trunk/testing/tests/jni/src/myMain.java b/testing/tests/jni/src/myMain.java
similarity index 100%
rename from trunk/testing/tests/jni/src/myMain.java
rename to testing/tests/jni/src/myMain.java
diff --git a/trunk/testing/tests/jni/src/t3GT3.c b/testing/tests/jni/src/t3GT3.c
similarity index 100%
rename from trunk/testing/tests/jni/src/t3GT3.c
rename to testing/tests/jni/src/t3GT3.c
diff --git a/trunk/testing/tests/jni/src/t3GT3.java b/testing/tests/jni/src/t3GT3.java
similarity index 100%
rename from trunk/testing/tests/jni/src/t3GT3.java
rename to testing/tests/jni/src/t3GT3.java
diff --git a/trunk/testing/tests/jni/src/t3GT3Worker.java b/testing/tests/jni/src/t3GT3Worker.java
similarity index 100%
rename from trunk/testing/tests/jni/src/t3GT3Worker.java
rename to testing/tests/jni/src/t3GT3Worker.java
diff --git a/trunk/testing/tests/jni/src/t3GTWorker2.java b/testing/tests/jni/src/t3GTWorker2.java
similarity index 100%
rename from trunk/testing/tests/jni/src/t3GTWorker2.java
rename to testing/tests/jni/src/t3GTWorker2.java
diff --git a/trunk/testing/tests/jni/src/tBlockingThreads.c b/testing/tests/jni/src/tBlockingThreads.c
similarity index 100%
rename from trunk/testing/tests/jni/src/tBlockingThreads.c
rename to testing/tests/jni/src/tBlockingThreads.c
diff --git a/trunk/testing/tests/jni/src/tBlockingThreads.java b/testing/tests/jni/src/tBlockingThreads.java
similarity index 100%
rename from trunk/testing/tests/jni/src/tBlockingThreads.java
rename to testing/tests/jni/src/tBlockingThreads.java
diff --git a/trunk/testing/tests/jni/src/tNative.c b/testing/tests/jni/src/tNative.c
similarity index 100%
rename from trunk/testing/tests/jni/src/tNative.c
rename to testing/tests/jni/src/tNative.c
diff --git a/trunk/testing/tests/jni/src/tNative.java b/testing/tests/jni/src/tNative.java
similarity index 100%
rename from trunk/testing/tests/jni/src/tNative.java
rename to testing/tests/jni/src/tNative.java
diff --git a/trunk/testing/tests/jni/src/tNativeThreads.c b/testing/tests/jni/src/tNativeThreads.c
similarity index 100%
rename from trunk/testing/tests/jni/src/tNativeThreads.c
rename to testing/tests/jni/src/tNativeThreads.c
diff --git a/trunk/testing/tests/jni/src/tNativeThreads.java b/testing/tests/jni/src/tNativeThreads.java
similarity index 100%
rename from trunk/testing/tests/jni/src/tNativeThreads.java
rename to testing/tests/jni/src/tNativeThreads.java
diff --git a/trunk/testing/tests/jni/src/testlib.c b/testing/tests/jni/src/testlib.c
similarity index 100%
rename from trunk/testing/tests/jni/src/testlib.c
rename to testing/tests/jni/src/testlib.c
diff --git a/trunk/testing/tests/jsr166-tck/build.xml b/testing/tests/jsr166-tck/build.xml
similarity index 100%
rename from trunk/testing/tests/jsr166-tck/build.xml
rename to testing/tests/jsr166-tck/build.xml
diff --git a/trunk/testing/tests/mmtk/build.xml b/testing/tests/mmtk/build.xml
similarity index 100%
rename from trunk/testing/tests/mmtk/build.xml
rename to testing/tests/mmtk/build.xml
diff --git a/trunk/testing/tests/mmtk/src/org/mmtk/utility/deque/ObjectReferenceDequeTest.java b/testing/tests/mmtk/src/org/mmtk/utility/deque/ObjectReferenceDequeTest.java
similarity index 100%
rename from trunk/testing/tests/mmtk/src/org/mmtk/utility/deque/ObjectReferenceDequeTest.java
rename to testing/tests/mmtk/src/org/mmtk/utility/deque/ObjectReferenceDequeTest.java
diff --git a/trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTest.java b/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTest.java
similarity index 100%
rename from trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTest.java
rename to testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTest.java
diff --git a/trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTestBasic.java b/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTestBasic.java
similarity index 100%
rename from trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTestBasic.java
rename to testing/tests/mmtk/src/org/vmmagic/unboxed/AddressTestBasic.java
diff --git a/trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/All.java b/testing/tests/mmtk/src/org/vmmagic/unboxed/All.java
similarity index 100%
rename from trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/All.java
rename to testing/tests/mmtk/src/org/vmmagic/unboxed/All.java
diff --git a/trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/ObjectReferenceTest.java b/testing/tests/mmtk/src/org/vmmagic/unboxed/ObjectReferenceTest.java
similarity index 100%
rename from trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/ObjectReferenceTest.java
rename to testing/tests/mmtk/src/org/vmmagic/unboxed/ObjectReferenceTest.java
diff --git a/trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/WordTest.java b/testing/tests/mmtk/src/org/vmmagic/unboxed/WordTest.java
similarity index 100%
rename from trunk/testing/tests/mmtk/src/org/vmmagic/unboxed/WordTest.java
rename to testing/tests/mmtk/src/org/vmmagic/unboxed/WordTest.java
diff --git a/trunk/testing/tests/opttests/build.xml b/testing/tests/opttests/build.xml
similarity index 100%
rename from trunk/testing/tests/opttests/build.xml
rename to testing/tests/opttests/build.xml
diff --git a/trunk/testing/tests/opttests/src/CheckStore.java b/testing/tests/opttests/src/CheckStore.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/CheckStore.java
rename to testing/tests/opttests/src/CheckStore.java
diff --git a/trunk/testing/tests/opttests/src/DeBruijn.java b/testing/tests/opttests/src/DeBruijn.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/DeBruijn.java
rename to testing/tests/opttests/src/DeBruijn.java
diff --git a/trunk/testing/tests/opttests/src/EscapeTest.java b/testing/tests/opttests/src/EscapeTest.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/EscapeTest.java
rename to testing/tests/opttests/src/EscapeTest.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest.java b/testing/tests/opttests/src/ExceptionTest.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest.java
rename to testing/tests/opttests/src/ExceptionTest.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest2.java b/testing/tests/opttests/src/ExceptionTest2.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest2.java
rename to testing/tests/opttests/src/ExceptionTest2.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest3.java b/testing/tests/opttests/src/ExceptionTest3.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest3.java
rename to testing/tests/opttests/src/ExceptionTest3.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest4.java b/testing/tests/opttests/src/ExceptionTest4.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest4.java
rename to testing/tests/opttests/src/ExceptionTest4.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest5.java b/testing/tests/opttests/src/ExceptionTest5.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest5.java
rename to testing/tests/opttests/src/ExceptionTest5.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest6.java b/testing/tests/opttests/src/ExceptionTest6.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest6.java
rename to testing/tests/opttests/src/ExceptionTest6.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest7.java b/testing/tests/opttests/src/ExceptionTest7.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest7.java
rename to testing/tests/opttests/src/ExceptionTest7.java
diff --git a/trunk/testing/tests/opttests/src/ExceptionTest8.java b/testing/tests/opttests/src/ExceptionTest8.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/ExceptionTest8.java
rename to testing/tests/opttests/src/ExceptionTest8.java
diff --git a/trunk/testing/tests/opttests/src/FinallyTest.java b/testing/tests/opttests/src/FinallyTest.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/FinallyTest.java
rename to testing/tests/opttests/src/FinallyTest.java
diff --git a/trunk/testing/tests/opttests/src/InvokeReflect.expected b/testing/tests/opttests/src/InvokeReflect.expected
similarity index 100%
rename from trunk/testing/tests/opttests/src/InvokeReflect.expected
rename to testing/tests/opttests/src/InvokeReflect.expected
diff --git a/trunk/testing/tests/opttests/src/InvokeReflect.java b/testing/tests/opttests/src/InvokeReflect.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/InvokeReflect.java
rename to testing/tests/opttests/src/InvokeReflect.java
diff --git a/trunk/testing/tests/opttests/src/PingPong.java b/testing/tests/opttests/src/PingPong.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/PingPong.java
rename to testing/tests/opttests/src/PingPong.java
diff --git a/trunk/testing/tests/opttests/src/TestArithmetic.java b/testing/tests/opttests/src/TestArithmetic.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestArithmetic.java
rename to testing/tests/opttests/src/TestArithmetic.java
diff --git a/trunk/testing/tests/opttests/src/TestArray.java b/testing/tests/opttests/src/TestArray.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestArray.java
rename to testing/tests/opttests/src/TestArray.java
diff --git a/trunk/testing/tests/opttests/src/TestArrayAccess.java b/testing/tests/opttests/src/TestArrayAccess.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestArrayAccess.java
rename to testing/tests/opttests/src/TestArrayAccess.java
diff --git a/trunk/testing/tests/opttests/src/TestBarrier.java b/testing/tests/opttests/src/TestBarrier.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestBarrier.java
rename to testing/tests/opttests/src/TestBarrier.java
diff --git a/trunk/testing/tests/opttests/src/TestCall.java b/testing/tests/opttests/src/TestCall.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestCall.java
rename to testing/tests/opttests/src/TestCall.java
diff --git a/trunk/testing/tests/opttests/src/TestClassInitializer.java b/testing/tests/opttests/src/TestClassInitializer.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestClassInitializer.java
rename to testing/tests/opttests/src/TestClassInitializer.java
diff --git a/trunk/testing/tests/opttests/src/TestCompare.java b/testing/tests/opttests/src/TestCompare.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestCompare.java
rename to testing/tests/opttests/src/TestCompare.java
diff --git a/trunk/testing/tests/opttests/src/TestConstants.java b/testing/tests/opttests/src/TestConstants.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestConstants.java
rename to testing/tests/opttests/src/TestConstants.java
diff --git a/trunk/testing/tests/opttests/src/TestConversions.java b/testing/tests/opttests/src/TestConversions.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestConversions.java
rename to testing/tests/opttests/src/TestConversions.java
diff --git a/trunk/testing/tests/opttests/src/TestEncodedCallSiteTree.java b/testing/tests/opttests/src/TestEncodedCallSiteTree.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestEncodedCallSiteTree.java
rename to testing/tests/opttests/src/TestEncodedCallSiteTree.java
diff --git a/trunk/testing/tests/opttests/src/TestExceptionThrow.java b/testing/tests/opttests/src/TestExceptionThrow.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestExceptionThrow.java
rename to testing/tests/opttests/src/TestExceptionThrow.java
diff --git a/trunk/testing/tests/opttests/src/TestFieldAccess.java b/testing/tests/opttests/src/TestFieldAccess.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestFieldAccess.java
rename to testing/tests/opttests/src/TestFieldAccess.java
diff --git a/trunk/testing/tests/opttests/src/TestFinally.java b/testing/tests/opttests/src/TestFinally.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestFinally.java
rename to testing/tests/opttests/src/TestFinally.java
diff --git a/trunk/testing/tests/opttests/src/TestInstanceOf.java b/testing/tests/opttests/src/TestInstanceOf.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestInstanceOf.java
rename to testing/tests/opttests/src/TestInstanceOf.java
diff --git a/trunk/testing/tests/opttests/src/TestInterfaceCall.java b/testing/tests/opttests/src/TestInterfaceCall.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestInterfaceCall.java
rename to testing/tests/opttests/src/TestInterfaceCall.java
diff --git a/trunk/testing/tests/opttests/src/TestLookupSwitch.java b/testing/tests/opttests/src/TestLookupSwitch.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestLookupSwitch.java
rename to testing/tests/opttests/src/TestLookupSwitch.java
diff --git a/trunk/testing/tests/opttests/src/TestMath.java b/testing/tests/opttests/src/TestMath.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestMath.java
rename to testing/tests/opttests/src/TestMath.java
diff --git a/trunk/testing/tests/opttests/src/TestReturn.java b/testing/tests/opttests/src/TestReturn.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestReturn.java
rename to testing/tests/opttests/src/TestReturn.java
diff --git a/trunk/testing/tests/opttests/src/TestSpecialCall.java b/testing/tests/opttests/src/TestSpecialCall.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestSpecialCall.java
rename to testing/tests/opttests/src/TestSpecialCall.java
diff --git a/trunk/testing/tests/opttests/src/TestStackAccess.java b/testing/tests/opttests/src/TestStackAccess.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestStackAccess.java
rename to testing/tests/opttests/src/TestStackAccess.java
diff --git a/trunk/testing/tests/opttests/src/TestSwitch.java b/testing/tests/opttests/src/TestSwitch.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestSwitch.java
rename to testing/tests/opttests/src/TestSwitch.java
diff --git a/trunk/testing/tests/opttests/src/TestThrow.java b/testing/tests/opttests/src/TestThrow.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestThrow.java
rename to testing/tests/opttests/src/TestThrow.java
diff --git a/trunk/testing/tests/opttests/src/TestThrow2.java b/testing/tests/opttests/src/TestThrow2.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestThrow2.java
rename to testing/tests/opttests/src/TestThrow2.java
diff --git a/trunk/testing/tests/opttests/src/TestUnresolved.java b/testing/tests/opttests/src/TestUnresolved.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TestUnresolved.java
rename to testing/tests/opttests/src/TestUnresolved.java
diff --git a/trunk/testing/tests/opttests/src/TypeCheck.java b/testing/tests/opttests/src/TypeCheck.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/TypeCheck.java
rename to testing/tests/opttests/src/TypeCheck.java
diff --git a/trunk/testing/tests/opttests/src/bug.java b/testing/tests/opttests/src/bug.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/bug.java
rename to testing/tests/opttests/src/bug.java
diff --git a/trunk/testing/tests/opttests/src/dtc.java b/testing/tests/opttests/src/dtc.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/dtc.java
rename to testing/tests/opttests/src/dtc.java
diff --git a/trunk/testing/tests/opttests/src/fibo.java b/testing/tests/opttests/src/fibo.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/fibo.java
rename to testing/tests/opttests/src/fibo.java
diff --git a/trunk/testing/tests/opttests/src/gctest.java b/testing/tests/opttests/src/gctest.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/gctest.java
rename to testing/tests/opttests/src/gctest.java
diff --git a/trunk/testing/tests/opttests/src/hanoi.java b/testing/tests/opttests/src/hanoi.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/hanoi.java
rename to testing/tests/opttests/src/hanoi.java
diff --git a/trunk/testing/tests/opttests/src/hanoioo.java b/testing/tests/opttests/src/hanoioo.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/hanoioo.java
rename to testing/tests/opttests/src/hanoioo.java
diff --git a/trunk/testing/tests/opttests/src/hello.java b/testing/tests/opttests/src/hello.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/hello.java
rename to testing/tests/opttests/src/hello.java
diff --git a/trunk/testing/tests/opttests/src/inlineDeep.java b/testing/tests/opttests/src/inlineDeep.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineDeep.java
rename to testing/tests/opttests/src/inlineDeep.java
diff --git a/trunk/testing/tests/opttests/src/inlineExcept.java b/testing/tests/opttests/src/inlineExcept.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineExcept.java
rename to testing/tests/opttests/src/inlineExcept.java
diff --git a/trunk/testing/tests/opttests/src/inlineTest.java b/testing/tests/opttests/src/inlineTest.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineTest.java
rename to testing/tests/opttests/src/inlineTest.java
diff --git a/trunk/testing/tests/opttests/src/inlineTest2.java b/testing/tests/opttests/src/inlineTest2.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineTest2.java
rename to testing/tests/opttests/src/inlineTest2.java
diff --git a/trunk/testing/tests/opttests/src/inlineTest3.java b/testing/tests/opttests/src/inlineTest3.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineTest3.java
rename to testing/tests/opttests/src/inlineTest3.java
diff --git a/trunk/testing/tests/opttests/src/inlineTest5.java b/testing/tests/opttests/src/inlineTest5.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineTest5.java
rename to testing/tests/opttests/src/inlineTest5.java
diff --git a/trunk/testing/tests/opttests/src/inlineTest6.java b/testing/tests/opttests/src/inlineTest6.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineTest6.java
rename to testing/tests/opttests/src/inlineTest6.java
diff --git a/trunk/testing/tests/opttests/src/inlineTest7.java b/testing/tests/opttests/src/inlineTest7.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/inlineTest7.java
rename to testing/tests/opttests/src/inlineTest7.java
diff --git a/trunk/testing/tests/opttests/src/interf.java b/testing/tests/opttests/src/interf.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/interf.java
rename to testing/tests/opttests/src/interf.java
diff --git a/trunk/testing/tests/opttests/src/largeMethod.java b/testing/tests/opttests/src/largeMethod.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/largeMethod.java
rename to testing/tests/opttests/src/largeMethod.java
diff --git a/trunk/testing/tests/opttests/src/logic.java b/testing/tests/opttests/src/logic.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/logic.java
rename to testing/tests/opttests/src/logic.java
diff --git a/trunk/testing/tests/opttests/src/matmul.java b/testing/tests/opttests/src/matmul.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/matmul.java
rename to testing/tests/opttests/src/matmul.java
diff --git a/trunk/testing/tests/opttests/src/milestone.java b/testing/tests/opttests/src/milestone.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/milestone.java
rename to testing/tests/opttests/src/milestone.java
diff --git a/trunk/testing/tests/opttests/src/sieve.java b/testing/tests/opttests/src/sieve.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/sieve.java
rename to testing/tests/opttests/src/sieve.java
diff --git a/trunk/testing/tests/opttests/src/stPutGet.java b/testing/tests/opttests/src/stPutGet.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/stPutGet.java
rename to testing/tests/opttests/src/stPutGet.java
diff --git a/trunk/testing/tests/opttests/src/stack.java b/testing/tests/opttests/src/stack.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/stack.java
rename to testing/tests/opttests/src/stack.java
diff --git a/trunk/testing/tests/opttests/src/table.java b/testing/tests/opttests/src/table.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/table.java
rename to testing/tests/opttests/src/table.java
diff --git a/trunk/testing/tests/opttests/src/tak_db.java b/testing/tests/opttests/src/tak_db.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/tak_db.java
rename to testing/tests/opttests/src/tak_db.java
diff --git a/trunk/testing/tests/opttests/src/tak_fp.java b/testing/tests/opttests/src/tak_fp.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/tak_fp.java
rename to testing/tests/opttests/src/tak_fp.java
diff --git a/trunk/testing/tests/opttests/src/tak_int.java b/testing/tests/opttests/src/tak_int.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/tak_int.java
rename to testing/tests/opttests/src/tak_int.java
diff --git a/trunk/testing/tests/opttests/src/tak_long.java b/testing/tests/opttests/src/tak_long.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/tak_long.java
rename to testing/tests/opttests/src/tak_long.java
diff --git a/trunk/testing/tests/opttests/src/testCounts.java b/testing/tests/opttests/src/testCounts.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/testCounts.java
rename to testing/tests/opttests/src/testCounts.java
diff --git a/trunk/testing/tests/opttests/src/testSwitchHIR.java b/testing/tests/opttests/src/testSwitchHIR.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/testSwitchHIR.java
rename to testing/tests/opttests/src/testSwitchHIR.java
diff --git a/trunk/testing/tests/opttests/src/testpm.java b/testing/tests/opttests/src/testpm.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/testpm.java
rename to testing/tests/opttests/src/testpm.java
diff --git a/trunk/testing/tests/opttests/src/threadTest1.java b/testing/tests/opttests/src/threadTest1.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/threadTest1.java
rename to testing/tests/opttests/src/threadTest1.java
diff --git a/trunk/testing/tests/opttests/src/unresolved.java b/testing/tests/opttests/src/unresolved.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/unresolved.java
rename to testing/tests/opttests/src/unresolved.java
diff --git a/trunk/testing/tests/opttests/src/virtUnPutGet.java b/testing/tests/opttests/src/virtUnPutGet.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/virtUnPutGet.java
rename to testing/tests/opttests/src/virtUnPutGet.java
diff --git a/trunk/testing/tests/opttests/src/virtUnresolved.java b/testing/tests/opttests/src/virtUnresolved.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/virtUnresolved.java
rename to testing/tests/opttests/src/virtUnresolved.java
diff --git a/trunk/testing/tests/opttests/src/virtual.java b/testing/tests/opttests/src/virtual.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/virtual.java
rename to testing/tests/opttests/src/virtual.java
diff --git a/trunk/testing/tests/opttests/src/whet.java b/testing/tests/opttests/src/whet.java
similarity index 100%
rename from trunk/testing/tests/opttests/src/whet.java
rename to testing/tests/opttests/src/whet.java
diff --git a/trunk/testing/tests/perf-dacapo/build.xml b/testing/tests/perf-dacapo/build.xml
similarity index 100%
rename from trunk/testing/tests/perf-dacapo/build.xml
rename to testing/tests/perf-dacapo/build.xml
diff --git a/trunk/testing/tests/perf-dacapo/dacapo.properties b/testing/tests/perf-dacapo/dacapo.properties
similarity index 100%
rename from trunk/testing/tests/perf-dacapo/dacapo.properties
rename to testing/tests/perf-dacapo/dacapo.properties
diff --git a/trunk/testing/tests/perf-jbb2000/SPECjbb.perf.props b/testing/tests/perf-jbb2000/SPECjbb.perf.props
similarity index 100%
rename from trunk/testing/tests/perf-jbb2000/SPECjbb.perf.props
rename to testing/tests/perf-jbb2000/SPECjbb.perf.props
diff --git a/trunk/testing/tests/perf-jbb2000/SPECjbb_1.1.1.props b/testing/tests/perf-jbb2000/SPECjbb_1.1.1.props
similarity index 100%
rename from trunk/testing/tests/perf-jbb2000/SPECjbb_1.1.1.props
rename to testing/tests/perf-jbb2000/SPECjbb_1.1.1.props
diff --git a/trunk/testing/tests/perf-jbb2000/SPECjbb_4.4.4.props b/testing/tests/perf-jbb2000/SPECjbb_4.4.4.props
similarity index 100%
rename from trunk/testing/tests/perf-jbb2000/SPECjbb_4.4.4.props
rename to testing/tests/perf-jbb2000/SPECjbb_4.4.4.props
diff --git a/trunk/testing/tests/perf-jbb2000/SPECjbb_config.props b/testing/tests/perf-jbb2000/SPECjbb_config.props
similarity index 100%
rename from trunk/testing/tests/perf-jbb2000/SPECjbb_config.props
rename to testing/tests/perf-jbb2000/SPECjbb_config.props
diff --git a/trunk/testing/tests/perf-jbb2000/build.xml b/testing/tests/perf-jbb2000/build.xml
similarity index 100%
rename from trunk/testing/tests/perf-jbb2000/build.xml
rename to testing/tests/perf-jbb2000/build.xml
diff --git a/trunk/testing/tests/perf-jbb2000/jbb2000.properties b/testing/tests/perf-jbb2000/jbb2000.properties
similarity index 100%
rename from trunk/testing/tests/perf-jbb2000/jbb2000.properties
rename to testing/tests/perf-jbb2000/jbb2000.properties
diff --git a/trunk/testing/tests/perf-jbb2005/SPECjbb.perf.props b/testing/tests/perf-jbb2005/SPECjbb.perf.props
similarity index 100%
rename from trunk/testing/tests/perf-jbb2005/SPECjbb.perf.props
rename to testing/tests/perf-jbb2005/SPECjbb.perf.props
diff --git a/trunk/testing/tests/perf-jbb2005/SPECjbb_config.props b/testing/tests/perf-jbb2005/SPECjbb_config.props
similarity index 100%
rename from trunk/testing/tests/perf-jbb2005/SPECjbb_config.props
rename to testing/tests/perf-jbb2005/SPECjbb_config.props
diff --git a/trunk/testing/tests/perf-jbb2005/build.xml b/testing/tests/perf-jbb2005/build.xml
similarity index 100%
rename from trunk/testing/tests/perf-jbb2005/build.xml
rename to testing/tests/perf-jbb2005/build.xml
diff --git a/trunk/testing/tests/perf-jbb2005/jbb2005.properties b/testing/tests/perf-jbb2005/jbb2005.properties
similarity index 100%
rename from trunk/testing/tests/perf-jbb2005/jbb2005.properties
rename to testing/tests/perf-jbb2005/jbb2005.properties
diff --git a/trunk/testing/tests/perf-jvm98/bin/extractfinalresult b/testing/tests/perf-jvm98/bin/extractfinalresult
similarity index 100%
rename from trunk/testing/tests/perf-jvm98/bin/extractfinalresult
rename to testing/tests/perf-jvm98/bin/extractfinalresult
diff --git a/trunk/testing/tests/perf-jvm98/build.xml b/testing/tests/perf-jvm98/build.xml
similarity index 100%
rename from trunk/testing/tests/perf-jvm98/build.xml
rename to testing/tests/perf-jvm98/build.xml
diff --git a/trunk/testing/tests/perf-jvm98/jvm98.properties b/testing/tests/perf-jvm98/jvm98.properties
similarity index 100%
rename from trunk/testing/tests/perf-jvm98/jvm98.properties
rename to testing/tests/perf-jvm98/jvm98.properties
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb.perf.props b/testing/tests/pseudojbb/props/pseudojbb.perf.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb.perf.props
rename to testing/tests/pseudojbb/props/pseudojbb.perf.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb.sanity.props b/testing/tests/pseudojbb/props/pseudojbb.sanity.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb.sanity.props
rename to testing/tests/pseudojbb/props/pseudojbb.sanity.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.120000.props b/testing/tests/pseudojbb/props/pseudojbb_1.120000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.120000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.120000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.160000.props b/testing/tests/pseudojbb/props/pseudojbb_1.160000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.160000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.160000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.200000.props b/testing/tests/pseudojbb/props/pseudojbb_1.200000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.200000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.200000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.40000.props b/testing/tests/pseudojbb/props/pseudojbb_1.40000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.40000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.40000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.400000.props b/testing/tests/pseudojbb/props/pseudojbb_1.400000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.400000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.400000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.600000.props b/testing/tests/pseudojbb/props/pseudojbb_1.600000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.600000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.600000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.80000.props b/testing/tests/pseudojbb/props/pseudojbb_1.80000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.80000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.80000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.800000.props b/testing/tests/pseudojbb/props/pseudojbb_1.800000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.800000.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.800000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_1.props b/testing/tests/pseudojbb/props/pseudojbb_1.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_1.props
rename to testing/tests/pseudojbb/props/pseudojbb_1.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.120000.props b/testing/tests/pseudojbb/props/pseudojbb_2.120000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.120000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.120000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.160000.props b/testing/tests/pseudojbb/props/pseudojbb_2.160000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.160000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.160000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.200000.props b/testing/tests/pseudojbb/props/pseudojbb_2.200000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.200000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.200000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.40000.props b/testing/tests/pseudojbb/props/pseudojbb_2.40000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.40000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.40000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.400000.props b/testing/tests/pseudojbb/props/pseudojbb_2.400000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.400000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.400000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.600000.props b/testing/tests/pseudojbb/props/pseudojbb_2.600000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.600000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.600000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.80000.props b/testing/tests/pseudojbb/props/pseudojbb_2.80000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.80000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.80000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.800000.props b/testing/tests/pseudojbb/props/pseudojbb_2.800000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.800000.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.800000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_2.props b/testing/tests/pseudojbb/props/pseudojbb_2.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_2.props
rename to testing/tests/pseudojbb/props/pseudojbb_2.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.120000.props b/testing/tests/pseudojbb/props/pseudojbb_3.120000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.120000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.120000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.160000.props b/testing/tests/pseudojbb/props/pseudojbb_3.160000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.160000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.160000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.200000.props b/testing/tests/pseudojbb/props/pseudojbb_3.200000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.200000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.200000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.40000.props b/testing/tests/pseudojbb/props/pseudojbb_3.40000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.40000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.40000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.400000.props b/testing/tests/pseudojbb/props/pseudojbb_3.400000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.400000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.400000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.600000.props b/testing/tests/pseudojbb/props/pseudojbb_3.600000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.600000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.600000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.80000.props b/testing/tests/pseudojbb/props/pseudojbb_3.80000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.80000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.80000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.800000.props b/testing/tests/pseudojbb/props/pseudojbb_3.800000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.800000.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.800000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_3.props b/testing/tests/pseudojbb/props/pseudojbb_3.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_3.props
rename to testing/tests/pseudojbb/props/pseudojbb_3.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.120000.props b/testing/tests/pseudojbb/props/pseudojbb_4.120000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.120000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.120000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.160000.props b/testing/tests/pseudojbb/props/pseudojbb_4.160000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.160000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.160000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.200000.props b/testing/tests/pseudojbb/props/pseudojbb_4.200000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.200000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.200000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.40000.props b/testing/tests/pseudojbb/props/pseudojbb_4.40000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.40000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.40000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.400000.props b/testing/tests/pseudojbb/props/pseudojbb_4.400000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.400000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.400000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.600000.props b/testing/tests/pseudojbb/props/pseudojbb_4.600000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.600000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.600000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.80000.props b/testing/tests/pseudojbb/props/pseudojbb_4.80000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.80000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.80000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.800000.props b/testing/tests/pseudojbb/props/pseudojbb_4.800000.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.800000.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.800000.props
diff --git a/trunk/testing/tests/pseudojbb/props/pseudojbb_4.props b/testing/tests/pseudojbb/props/pseudojbb_4.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/props/pseudojbb_4.props
rename to testing/tests/pseudojbb/props/pseudojbb_4.props
diff --git a/trunk/testing/tests/pseudojbb/pseudojbb.perf.props b/testing/tests/pseudojbb/pseudojbb.perf.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/pseudojbb.perf.props
rename to testing/tests/pseudojbb/pseudojbb.perf.props
diff --git a/trunk/testing/tests/pseudojbb/pseudojbb.sanity.props b/testing/tests/pseudojbb/pseudojbb.sanity.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/pseudojbb.sanity.props
rename to testing/tests/pseudojbb/pseudojbb.sanity.props
diff --git a/trunk/testing/tests/pseudojbb/pseudojbb_config.props b/testing/tests/pseudojbb/pseudojbb_config.props
similarity index 100%
rename from trunk/testing/tests/pseudojbb/pseudojbb_config.props
rename to testing/tests/pseudojbb/pseudojbb_config.props
diff --git a/trunk/testing/tests/soot/build.xml b/testing/tests/soot/build.xml
similarity index 100%
rename from trunk/testing/tests/soot/build.xml
rename to testing/tests/soot/build.xml
diff --git a/trunk/testing/tests/soot/src/Hello.java b/testing/tests/soot/src/Hello.java
similarity index 100%
rename from trunk/testing/tests/soot/src/Hello.java
rename to testing/tests/soot/src/Hello.java
diff --git a/trunk/testing/tests/x10/build.xml b/testing/tests/x10/build.xml
similarity index 100%
rename from trunk/testing/tests/x10/build.xml
rename to testing/tests/x10/build.xml
diff --git a/trunk/testing/tests/xerces/build.xml b/testing/tests/xerces/build.xml
similarity index 100%
rename from trunk/testing/tests/xerces/build.xml
rename to testing/tests/xerces/build.xml
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingAntTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingAntTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingAntTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingAntTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingXMLValidateTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingXMLValidateTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingXMLValidateTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/ErrorRecordingXMLValidateTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ForEachTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/ForEachTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ForEachTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/ForEachTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/HostnameTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/HostnameTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/HostnameTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/HostnameTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/IfTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/IfTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/IfTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/IfTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/LineFilterTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/LineFilterTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/LineFilterTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/LineFilterTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/SelectRegexTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/SelectRegexTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/SelectRegexTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/SelectRegexTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/TimerTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/TimerTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/TimerTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/TimerTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ToAsciiTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/ToAsciiTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/ToAsciiTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/ToAsciiTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/TruncateTask.java b/tools/ant-tasks/src/org/jikesrvm/tools/ant/TruncateTask.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/ant/TruncateTask.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/ant/TruncateTask.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessor.java b/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessor.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessor.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessor.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessorFactory.java b/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessorFactory.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessorFactory.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/apt/SysCallProcessorFactory.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/template/GenerateFromTemplate.java b/tools/ant-tasks/src/org/jikesrvm/tools/template/GenerateFromTemplate.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/template/GenerateFromTemplate.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/template/GenerateFromTemplate.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/template/QuotedStringTokenizer.java b/tools/ant-tasks/src/org/jikesrvm/tools/template/QuotedStringTokenizer.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/template/QuotedStringTokenizer.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/template/QuotedStringTokenizer.java
diff --git a/trunk/tools/ant-tasks/src/org/jikesrvm/tools/template/UnterminatedStringException.java b/tools/ant-tasks/src/org/jikesrvm/tools/template/UnterminatedStringException.java
similarity index 100%
rename from trunk/tools/ant-tasks/src/org/jikesrvm/tools/template/UnterminatedStringException.java
rename to tools/ant-tasks/src/org/jikesrvm/tools/template/UnterminatedStringException.java
diff --git a/trunk/tools/asm-tasks/src/org/jikesrvm/tools/asm/AnnotationAdder.java b/tools/asm-tasks/src/org/jikesrvm/tools/asm/AnnotationAdder.java
similarity index 100%
rename from trunk/tools/asm-tasks/src/org/jikesrvm/tools/asm/AnnotationAdder.java
rename to tools/asm-tasks/src/org/jikesrvm/tools/asm/AnnotationAdder.java
diff --git a/trunk/tools/bootImageRunner/RunBootImage.C b/tools/bootImageRunner/RunBootImage.C
similarity index 100%
rename from trunk/tools/bootImageRunner/RunBootImage.C
rename to tools/bootImageRunner/RunBootImage.C
diff --git a/trunk/tools/bootImageRunner/bootImageRunner.h b/tools/bootImageRunner/bootImageRunner.h
similarity index 100%
rename from trunk/tools/bootImageRunner/bootImageRunner.h
rename to tools/bootImageRunner/bootImageRunner.h
diff --git a/trunk/tools/bootImageRunner/cAttributePortability.h b/tools/bootImageRunner/cAttributePortability.h
similarity index 100%
rename from trunk/tools/bootImageRunner/cAttributePortability.h
rename to tools/bootImageRunner/cAttributePortability.h
diff --git a/trunk/tools/bootImageRunner/cmdLine.h b/tools/bootImageRunner/cmdLine.h
similarity index 100%
rename from trunk/tools/bootImageRunner/cmdLine.h
rename to tools/bootImageRunner/cmdLine.h
diff --git a/trunk/tools/bootImageRunner/harmony.c b/tools/bootImageRunner/harmony.c
similarity index 100%
rename from trunk/tools/bootImageRunner/harmony.c
rename to tools/bootImageRunner/harmony.c
diff --git a/trunk/tools/bootImageRunner/harmony.exp b/tools/bootImageRunner/harmony.exp
similarity index 100%
rename from trunk/tools/bootImageRunner/harmony.exp
rename to tools/bootImageRunner/harmony.exp
diff --git a/trunk/tools/bootImageRunner/ia32/disasm.c b/tools/bootImageRunner/ia32/disasm.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/disasm.c
rename to tools/bootImageRunner/ia32/disasm.c
diff --git a/trunk/tools/bootImageRunner/ia32/disasm.h b/tools/bootImageRunner/ia32/disasm.h
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/disasm.h
rename to tools/bootImageRunner/ia32/disasm.h
diff --git a/trunk/tools/bootImageRunner/ia32/ihnpdsm.c b/tools/bootImageRunner/ia32/ihnpdsm.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/ihnpdsm.c
rename to tools/bootImageRunner/ia32/ihnpdsm.c
diff --git a/trunk/tools/bootImageRunner/ia32/ihnpdsm.h b/tools/bootImageRunner/ia32/ihnpdsm.h
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/ihnpdsm.h
rename to tools/bootImageRunner/ia32/ihnpdsm.h
diff --git a/trunk/tools/bootImageRunner/ia32/initBootRecord.c b/tools/bootImageRunner/ia32/initBootRecord.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/initBootRecord.c
rename to tools/bootImageRunner/ia32/initBootRecord.c
diff --git a/trunk/tools/bootImageRunner/ia32/libvm.c b/tools/bootImageRunner/ia32/libvm.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/libvm.c
rename to tools/bootImageRunner/ia32/libvm.c
diff --git a/trunk/tools/bootImageRunner/ia32/linux_ucontext.h b/tools/bootImageRunner/ia32/linux_ucontext.h
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/linux_ucontext.h
rename to tools/bootImageRunner/ia32/linux_ucontext.h
diff --git a/trunk/tools/bootImageRunner/ia32/osx_ucontext.h b/tools/bootImageRunner/ia32/osx_ucontext.h
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/osx_ucontext.h
rename to tools/bootImageRunner/ia32/osx_ucontext.h
diff --git a/trunk/tools/bootImageRunner/ia32/solaris_ucontext.h b/tools/bootImageRunner/ia32/solaris_ucontext.h
similarity index 100%
rename from trunk/tools/bootImageRunner/ia32/solaris_ucontext.h
rename to tools/bootImageRunner/ia32/solaris_ucontext.h
diff --git a/trunk/tools/bootImageRunner/jvm.C b/tools/bootImageRunner/jvm.C
similarity index 100%
rename from trunk/tools/bootImageRunner/jvm.C
rename to tools/bootImageRunner/jvm.C
diff --git a/trunk/tools/bootImageRunner/org_jikesrvm_runtime_DynamicLibrary.c b/tools/bootImageRunner/org_jikesrvm_runtime_DynamicLibrary.c
similarity index 100%
rename from trunk/tools/bootImageRunner/org_jikesrvm_runtime_DynamicLibrary.c
rename to tools/bootImageRunner/org_jikesrvm_runtime_DynamicLibrary.c
diff --git a/trunk/tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VMProcess.c b/tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VMProcess.c
similarity index 100%
rename from trunk/tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VMProcess.c
rename to tools/bootImageRunner/org_jikesrvm_scheduler_greenthreads_VMProcess.c
diff --git a/trunk/tools/bootImageRunner/parse_map.perl b/tools/bootImageRunner/parse_map.perl
similarity index 100%
rename from trunk/tools/bootImageRunner/parse_map.perl
rename to tools/bootImageRunner/parse_map.perl
diff --git a/trunk/tools/bootImageRunner/perfctr.C b/tools/bootImageRunner/perfctr.C
similarity index 100%
rename from trunk/tools/bootImageRunner/perfctr.C
rename to tools/bootImageRunner/perfctr.C
diff --git a/trunk/tools/bootImageRunner/perfctr.h b/tools/bootImageRunner/perfctr.h
similarity index 100%
rename from trunk/tools/bootImageRunner/perfctr.h
rename to tools/bootImageRunner/perfctr.h
diff --git a/trunk/tools/bootImageRunner/ppc/AixLinkageLayout.h b/tools/bootImageRunner/ppc/AixLinkageLayout.h
similarity index 100%
rename from trunk/tools/bootImageRunner/ppc/AixLinkageLayout.h
rename to tools/bootImageRunner/ppc/AixLinkageLayout.h
diff --git a/trunk/tools/bootImageRunner/ppc/bootThread.c b/tools/bootImageRunner/ppc/bootThread.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ppc/bootThread.c
rename to tools/bootImageRunner/ppc/bootThread.c
diff --git a/trunk/tools/bootImageRunner/ppc/initBootRecord.c b/tools/bootImageRunner/ppc/initBootRecord.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ppc/initBootRecord.c
rename to tools/bootImageRunner/ppc/initBootRecord.c
diff --git a/trunk/tools/bootImageRunner/ppc/libvm.c b/tools/bootImageRunner/ppc/libvm.c
similarity index 100%
rename from trunk/tools/bootImageRunner/ppc/libvm.c
rename to tools/bootImageRunner/ppc/libvm.c
diff --git a/trunk/tools/bootImageRunner/rvm.classpath b/tools/bootImageRunner/rvm.classpath
similarity index 100%
rename from trunk/tools/bootImageRunner/rvm.classpath
rename to tools/bootImageRunner/rvm.classpath
diff --git a/trunk/tools/bootImageRunner/rvm.harmony b/tools/bootImageRunner/rvm.harmony
similarity index 100%
rename from trunk/tools/bootImageRunner/rvm.harmony
rename to tools/bootImageRunner/rvm.harmony
diff --git a/trunk/tools/bootImageRunner/sys.C b/tools/bootImageRunner/sys.C
similarity index 100%
rename from trunk/tools/bootImageRunner/sys.C
rename to tools/bootImageRunner/sys.C
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImage.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImage.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImage.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImage.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageMap.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageMap.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageMap.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageMap.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageObjectAddressRemapper.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageObjectAddressRemapper.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageObjectAddressRemapper.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageObjectAddressRemapper.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWorker.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWorker.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWorker.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWorker.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterConstants.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterConstants.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterConstants.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterConstants.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterMessages.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterMessages.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterMessages.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriterMessages.java
diff --git a/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BuildJNIFunctionTable.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BuildJNIFunctionTable.java
similarity index 100%
rename from trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BuildJNIFunctionTable.java
rename to tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BuildJNIFunctionTable.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Address.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Address.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Address.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Address.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/AddressArray.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/AddressArray.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ArchitecturalWord.template b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ArchitecturalWord.template
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ArchitecturalWord.template
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ArchitecturalWord.template
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Extent.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Extent.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Extent.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Extent.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ExtentArray.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReferenceArray.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Offset.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Offset.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Offset.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Offset.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/OffsetArray.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Word.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Word.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Word.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Word.java
diff --git a/trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/WordArray.java b/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/WordArray.java
similarity index 100%
rename from trunk/tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/WordArray.java
rename to tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/WordArray.java
diff --git a/trunk/tools/gcspy-stub/src/gcspy_buffered_output.h b/tools/gcspy-stub/src/gcspy_buffered_output.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_buffered_output.h
rename to tools/gcspy-stub/src/gcspy_buffered_output.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_color_db.h b/tools/gcspy-stub/src/gcspy_color_db.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_color_db.h
rename to tools/gcspy-stub/src/gcspy_color_db.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_command_stream.h b/tools/gcspy-stub/src/gcspy_command_stream.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_command_stream.h
rename to tools/gcspy-stub/src/gcspy_command_stream.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_gc_driver.h b/tools/gcspy-stub/src/gcspy_gc_driver.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_gc_driver.h
rename to tools/gcspy-stub/src/gcspy_gc_driver.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_gc_stream.h b/tools/gcspy-stub/src/gcspy_gc_stream.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_gc_stream.h
rename to tools/gcspy-stub/src/gcspy_gc_stream.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_interpreter.h b/tools/gcspy-stub/src/gcspy_interpreter.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_interpreter.h
rename to tools/gcspy-stub/src/gcspy_interpreter.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_main_server.c b/tools/gcspy-stub/src/gcspy_main_server.c
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_main_server.c
rename to tools/gcspy-stub/src/gcspy_main_server.c
diff --git a/trunk/tools/gcspy-stub/src/gcspy_main_server.h b/tools/gcspy-stub/src/gcspy_main_server.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_main_server.h
rename to tools/gcspy-stub/src/gcspy_main_server.h
diff --git a/trunk/tools/gcspy-stub/src/gcspy_utils.h b/tools/gcspy-stub/src/gcspy_utils.h
similarity index 100%
rename from trunk/tools/gcspy-stub/src/gcspy_utils.h
rename to tools/gcspy-stub/src/gcspy_utils.h
diff --git a/trunk/userguide/index.html b/userguide/index.html
similarity index 100%
rename from trunk/userguide/index.html
rename to userguide/index.html