diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1234/issue1234.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1234/issue1234.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1234/issue1234.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1234/issue1234.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1235/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1235/AndroidManifest.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1235/AndroidManifest.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1235/AndroidManifest.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1235/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1235/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1235/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1235/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1235/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1235/res/values/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1235/res/values/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1235/res/values/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1481/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1481/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1481/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1481/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1481/smali/com/ibotpeaches/issue1481/BuildConfig.smali b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1481/smali/com/ibotpeaches/issue1481/BuildConfig.smali
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1481/smali/com/ibotpeaches/issue1481/BuildConfig.smali
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1481/smali/com/ibotpeaches/issue1481/BuildConfig.smali
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1594/not_sparse.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1594/not_sparse.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1594/not_sparse.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1594/not_sparse.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1594/sparse.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1594/sparse.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1594/sparse.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1594/sparse.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1605/issue1605.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1605/issue1605.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1605/issue1605.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1605/issue1605.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1730/issue1730.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue1730/issue1730.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue1730/issue1730.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue1730/issue1730.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue636/issue636.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue636/issue636.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue636/issue636.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue636/issue636.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue767/issue767.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/issue767/issue767.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/issue767/issue767.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/issue767/issue767.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/shared_libraries/client.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/shared_libraries/client.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/shared_libraries/client.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/shared_libraries/client.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/shared_libraries/library.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/shared_libraries/library.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/shared_libraries/library.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/shared_libraries/library.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/AndroidManifest.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/AndroidManifest.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/AndroidManifest.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/assets/txt/no-unicode.txt b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/txt/no-unicode.txt
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/assets/txt/no-unicode.txt
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/txt/no-unicode.txt
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/assets/unicode-txt/∂-unicode.txt b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/unicode-txt/∂-unicode.txt
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/assets/unicode-txt/∂-unicode.txt
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/unicode-txt/∂-unicode.txt
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/kotlin/kotlin.kotlin_builtins b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/kotlin/kotlin.kotlin_builtins
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/kotlin/kotlin.kotlin_builtins
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/kotlin/kotlin.kotlin_builtins
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/lib/android-support-v13.jar b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/lib/android-support-v13.jar
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/lib/android-support-v13.jar
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/lib/android-support-v13.jar
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/libs/android-support-v13.jar b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/libs/android-support-v13.jar
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/libs/android-support-v13.jar
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/libs/android-support-v13.jar
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-534dpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-534dpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-534dpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-534dpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-anydpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-anydpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-anydpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-anydpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-hdpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-hdpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-hdpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-ldpi/data.jpg b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-ldpi/data.jpg
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-ldpi/data.jpg
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-ldpi/data.jpg
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-ldpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-ldpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-ldpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-mdpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-mdpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-mdpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-nodpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-nodpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-nodpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-nodpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-tvdpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-tvdpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-tvdpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-tvdpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/9patch.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/9patch.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/9patch.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/9patch.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/9patch_htc.r.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/9patch_htc.r.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/9patch_htc.r.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/9patch_htc.r.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/btn_zoom_up_normal.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/btn_zoom_up_normal.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/btn_zoom_up_normal.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/btn_zoom_up_normal.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi-v4/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi-v4/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi-v4/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi-v4/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/ic_notification_overlay.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/ic_notification_overlay.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/ic_notification_overlay.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/ic_notification_overlay.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/recents_lower_gradient.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/recents_lower_gradient.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/recents_lower_gradient.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/recents_lower_gradient.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/screenshot_panel.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/screenshot_panel.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/screenshot_panel.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/screenshot_panel.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/search_bg_transparent.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/search_bg_transparent.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/search_bg_transparent.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/search_bg_transparent.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/status_background.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/status_background.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/status_background.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/status_background.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/textfield_activated_holo_dark.9.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/textfield_activated_holo_dark.9.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxhdpi/textfield_activated_holo_dark.9.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxhdpi/textfield_activated_holo_dark.9.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxxhdpi/ic_launcher.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/drawable-xxxhdpi/ic_launcher.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/font/lobster.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/font/lobster.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/font/lobster.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/font/lobster.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/font/lobster_regular.otf b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/font/lobster_regular.otf
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/font/lobster_regular.otf
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/font/lobster_regular.otf
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1040.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1040.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1040.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1040.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1063.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1063.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1063.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1063.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1130.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1130.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1130.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1130.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1157.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1157.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1157.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1157.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1274.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1274.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1274.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1274.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1674.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1674.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/layout/issue1674.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/layout/issue1674.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/raw/blank_test.png b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/raw/blank_test.png
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/raw/blank_test.png
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/raw/blank_test.png
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/raw/no_extension b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/raw/no_extension
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/raw/no_extension
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/raw/no_extension
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ar-rXB/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ar-rXB/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ar-rXB/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ar-rXB/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ast-rES/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ast-rES/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ast-rES/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ast-rES/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ast/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ast/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ast/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ast/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+ast+Latn+IT+AREVELA/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+ast+Latn+IT+AREVELA/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+ast+Latn+IT+AREVELA/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+ast+Latn+IT+AREVELA/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+en+Latn+419/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+en+Latn+419/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+en+Latn+419/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+en+Latn+419/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+en+Latn+US/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+en+Latn+US/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+en+Latn+US/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+en+Latn+US/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+en+US+POSIX/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+en+US+POSIX/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+en+US+POSIX/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+en+US+POSIX/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+eng+419/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+eng+419/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-b+eng+419/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-b+eng+419/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-en-rUS/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-en-rUS/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-en-rUS/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-en-rUS/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-en/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-en/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-en/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-en/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-fr/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-fr/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-fr/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-fr/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ldrtl/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ldrtl/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-ldrtl/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-ldrtl/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-lowdr-v26/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-lowdr-v26/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-lowdr-v26/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-lowdr-v26/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001-mnc00/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001-mnc00/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001-mnc00/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001-mnc00/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001-mnc1/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001-mnc1/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001-mnc1/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001-mnc1/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/anims.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/anims.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/anims.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/anims.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/arrays.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/arrays.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/arrays.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/arrays.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/bools.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/bools.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/bools.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/bools.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/colors.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/colors.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/colors.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/colors.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/dimens.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/dimens.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/dimens.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/dimens.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/drawables.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/drawables.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/drawables.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/drawables.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/ids.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/ids.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/ids.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/ids.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/integers.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/integers.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/integers.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/integers.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/layouts.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/layouts.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/layouts.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/layouts.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/plurals.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/plurals.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/plurals.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/plurals.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/styles.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/styles.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc001/styles.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc001/styles.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc002/arrays.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc002/arrays.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc002/arrays.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc002/arrays.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc002/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc002/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc002/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc002/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/arrays.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/arrays.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/arrays.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/arrays.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/bools.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/bools.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/bools.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/bools.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/integers.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/integers.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/integers.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/integers.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc003/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc003/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc238-mnc6/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc238-mnc6/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc238-mnc6/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc238-mnc6/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc238-mnc870/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc238-mnc870/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mcc238-mnc870/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mcc238-mnc870/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mnc1/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mnc1/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-mnc1/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-mnc1/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-notround/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-notround/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-notround/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-notround/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-nowidecg-v26/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-nowidecg-v26/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-nowidecg-v26/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-nowidecg-v26/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-round/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-round/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-round/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-round/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-vrheadset-v26/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-vrheadset-v26/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-vrheadset-v26/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-vrheadset-v26/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-watch/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-watch/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-watch/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-watch/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-widecg-v26/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-widecg-v26/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values-widecg-v26/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values-widecg-v26/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/attrs.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/attrs.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/attrs.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/attrs.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/integers.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/integers.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/integers.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/integers.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/public.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/public.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/public.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/public.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/values/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/values/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/xml/literals.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/xml/literals.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/xml/literals.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/xml/literals.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/xml/references.xml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/xml/references.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/res/xml/references.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/res/xml/references.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/smali/HelloWorld.smali b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/smali/HelloWorld.smali
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/smali/HelloWorld.smali
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/smali/HelloWorld.smali
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/smali_classes2/HelloDualDexSupport.smali b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/smali_classes2/HelloDualDexSupport.smali
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/smali_classes2/HelloDualDexSupport.smali
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/smali_classes2/HelloDualDexSupport.smali
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/hidden.file b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/hidden.file
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/hidden.file
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/hidden.file
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/lib_bug603/bug603 b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/lib_bug603/bug603
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/lib_bug603/bug603
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/lib_bug603/bug603
diff --git "a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/non\177printable.file" "b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/non\177printable.file"
similarity index 100%
rename from "brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/non\177printable.file"
rename to "brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/non\177printable.file"
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/stored.file b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/stored.file
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/stored.file
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/stored.file
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/unk_folder/unknown_file b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/unk_folder/unknown_file
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testapp/unknown/unk_folder/unknown_file
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/unk_folder/unknown_file
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testjar/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testjar/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testjar/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testjar/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testjar/original/META-INF/MANIFEST.MF b/brut.apktool/apktool-lib/src/test/resources/aapt1/testjar/original/META-INF/MANIFEST.MF
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testjar/original/META-INF/MANIFEST.MF
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testjar/original/META-INF/MANIFEST.MF
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testjar/smali/com/apktool/test/Test.smali b/brut.apktool/apktool-lib/src/test/resources/aapt1/testjar/smali/com/apktool/test/Test.smali
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/testjar/smali/com/apktool/test/Test.smali
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testjar/smali/com/apktool/test/Test.smali
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/unknown_compression/deflated_unknowns.apk b/brut.apktool/apktool-lib/src/test/resources/aapt1/unknown_compression/deflated_unknowns.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt1/unknown_compression/deflated_unknowns.apk
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/unknown_compression/deflated_unknowns.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/AndroidManifest.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/AndroidManifest.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/AndroidManifest.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/integers.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/res/values/integers.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/integers.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/res/values/integers.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/public.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/res/values/public.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/public.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/res/values/public.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/res/values/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/pkgid8/res/values/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/pkgid8/res/values/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/AndroidManifest.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/AndroidManifest.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/AndroidManifest.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/res/values/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/doctype/AndroidManifest.xml b/brut.apktool/apktool-lib/src/test/resources/decode/doctype/AndroidManifest.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/doctype/AndroidManifest.xml
rename to brut.apktool/apktool-lib/src/test/resources/decode/doctype/AndroidManifest.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/doctype/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/decode/doctype/apktool.yml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/doctype/apktool.yml
rename to brut.apktool/apktool-lib/src/test/resources/decode/doctype/apktool.yml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1157/issue1157.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1157/issue1157.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1157/issue1157.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1157/issue1157.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1170/issue1170.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1170/issue1170.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1170/issue1170.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1170/issue1170.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1244/issue1244.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1244/issue1244.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1244/issue1244.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1244/issue1244.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1264/issue1264.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1264/issue1264.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1264/issue1264.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1264/issue1264.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1456/issue1456.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1456/issue1456.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1456/issue1456.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1456/issue1456.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1498/issue1498.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1498/issue1498.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1498/issue1498.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1498/issue1498.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1589/issue1589.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1589/issue1589.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1589/issue1589.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1589/issue1589.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1680/issue1680.apk b/brut.apktool/apktool-lib/src/test/resources/decode/issue1680/issue1680.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/issue1680/issue1680.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/issue1680/issue1680.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/testkotlin/testkotlin.apk b/brut.apktool/apktool-lib/src/test/resources/decode/testkotlin/testkotlin.apk
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/decode/testkotlin/testkotlin.apk
rename to brut.apktool/apktool-lib/src/test/resources/decode/testkotlin/testkotlin.apk
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/util/traversal/file b/brut.apktool/apktool-lib/src/test/resources/util/traversal/file
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/util/traversal/file
rename to brut.apktool/apktool-lib/src/test/resources/util/traversal/file