diff --git a/smali-integration-tests/src/temp/smali/jumbo_string_test/Format31c/Format31c.smali b/smali-integration-tests/src/test/smali/jumbo_string_test/Format31c/Format31c.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/jumbo_string_test/Format31c/Format31c.smali
rename to smali-integration-tests/src/test/smali/jumbo_string_test/Format31c/Format31c.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/FieldTest/FieldTest.smali b/smali-integration-tests/src/test/smali/junit-tests/FieldTest/FieldTest.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/FieldTest/FieldTest.smali
rename to smali-integration-tests/src/test/smali/junit-tests/FieldTest/FieldTest.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format10t/Format10t.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format10t/Format10t.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format10t/Format10t.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format10t/Format10t.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format10x/Format10x.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format10x/Format10x.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format10x/Format10x.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format10x/Format10x.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format11n/Format11n.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format11n/Format11n.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format11n/Format11n.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format11n/Format11n.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format11x/Format11x.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format11x/Format11x.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format11x/Format11x.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format11x/Format11x.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format12x/Format12x.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format12x/Format12x.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format12x/Format12x.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format12x/Format12x.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format20t/Format20t.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format20t/Format20t.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format20t/Format20t.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format20t/Format20t.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21c/Format21c.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21c/Format21c.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21c/Format21c.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21c/Format21c.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21c/StaticFields.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21c/StaticFields.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21c/StaticFields.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21c/StaticFields.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21c/StringWrapper.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21c/StringWrapper.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21c/StringWrapper.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21c/StringWrapper.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21h/Format21h.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21h/Format21h.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21h/Format21h.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21h/Format21h.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21s/Format21s.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21s/Format21s.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21s/Format21s.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21s/Format21s.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21t/Format21t.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21t/Format21t.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format21t/Format21t.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format21t/Format21t.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22b/Format22b.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22b/Format22b.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22b/Format22b.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22b/Format22b.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22c/Format22c.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22c/Format22c.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22c/Format22c.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22c/Format22c.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22c/InstanceFields.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22c/InstanceFields.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22c/InstanceFields.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22c/InstanceFields.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22s/Format22s.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22s/Format22s.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22s/Format22s.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22s/Format22s.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22t/Format22t.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22t/Format22t.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22t/Format22t.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22t/Format22t.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22x/Format22x.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22x/Format22x.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format22x/Format22x.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format22x/Format22x.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format23x/Format23x.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format23x/Format23x.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format23x/Format23x.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format23x/Format23x.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format30t/Format30t.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format30t/Format30t.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format30t/Format30t.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format30t/Format30t.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format31i/Format31i.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format31i/Format31i.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format31i/Format31i.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format31i/Format31i.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format31t/Format31t.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format31t/Format31t.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format31t/Format31t.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format31t/Format31t.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format32x/Format32x.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format32x/Format32x.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format32x/Format32x.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format32x/Format32x.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/Format35c.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/Format35c.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/Format35c.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/Format35c.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/Methods.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/Methods.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/Methods.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/Methods.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/MethodsInterface.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/MethodsInterface.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/MethodsInterface.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/MethodsInterface.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/MethodsSuper.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/MethodsSuper.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format35c/MethodsSuper.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format35c/MethodsSuper.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/Format3rc.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/Format3rc.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/Format3rc.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/Format3rc.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/RangeMethods.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/RangeMethods.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/RangeMethods.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/RangeMethods.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsInterface.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsInterface.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsInterface.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsInterface.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsSuper.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsSuper.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsSuper.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format3rc/RangeMethodsSuper.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format51l/Format51l.smali b/smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format51l/Format51l.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/InstructionTests/Format51l/Format51l.smali
rename to smali-integration-tests/src/test/smali/junit-tests/InstructionTests/Format51l/Format51l.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali b/smali-integration-tests/src/test/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali
rename to smali-integration-tests/src/test/smali/junit-tests/SpecialInstructionPaddingTest/SpecialInstructionPaddingTest.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/TestSuite.smali b/smali-integration-tests/src/test/smali/junit-tests/TestSuite.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/TestSuite.smali
rename to smali-integration-tests/src/test/smali/junit-tests/TestSuite.smali
diff --git a/smali-integration-tests/src/temp/smali/junit-tests/Util/Assert.smali b/smali-integration-tests/src/test/smali/junit-tests/Util/Assert.smali
similarity index 100%
rename from smali-integration-tests/src/temp/smali/junit-tests/Util/Assert.smali
rename to smali-integration-tests/src/test/smali/junit-tests/Util/Assert.smali