diff --git a/loader/.gitignore b/.gitignore
similarity index 100%
rename from loader/.gitignore
rename to .gitignore
diff --git a/loader/.gitmodules b/.gitmodules
similarity index 100%
rename from loader/.gitmodules
rename to .gitmodules
diff --git a/loader/README.md b/README.md
similarity index 100%
rename from loader/README.md
rename to README.md
diff --git a/loader/apksigner/.gitignore b/apksigner/.gitignore
similarity index 100%
rename from loader/apksigner/.gitignore
rename to apksigner/.gitignore
diff --git a/loader/apksigner/build.gradle b/apksigner/build.gradle
similarity index 100%
rename from loader/apksigner/build.gradle
rename to apksigner/build.gradle
diff --git a/loader/apksigner/src/main/java/com/android/apksig/ApkSigner.java b/apksigner/src/main/java/com/android/apksig/ApkSigner.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/ApkSigner.java
rename to apksigner/src/main/java/com/android/apksig/ApkSigner.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/ApkSignerEngine.java b/apksigner/src/main/java/com/android/apksig/ApkSignerEngine.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/ApkSignerEngine.java
rename to apksigner/src/main/java/com/android/apksig/ApkSignerEngine.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/ApkVerifier.java b/apksigner/src/main/java/com/android/apksig/ApkVerifier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/ApkVerifier.java
rename to apksigner/src/main/java/com/android/apksig/ApkVerifier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/DefaultApkSignerEngine.java b/apksigner/src/main/java/com/android/apksig/DefaultApkSignerEngine.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/DefaultApkSignerEngine.java
rename to apksigner/src/main/java/com/android/apksig/DefaultApkSignerEngine.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/Hints.java b/apksigner/src/main/java/com/android/apksig/Hints.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/Hints.java
rename to apksigner/src/main/java/com/android/apksig/Hints.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/SigningCertificateLineage.java b/apksigner/src/main/java/com/android/apksig/SigningCertificateLineage.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/SigningCertificateLineage.java
rename to apksigner/src/main/java/com/android/apksig/SigningCertificateLineage.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/apk/ApkFormatException.java b/apksigner/src/main/java/com/android/apksig/apk/ApkFormatException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/apk/ApkFormatException.java
rename to apksigner/src/main/java/com/android/apksig/apk/ApkFormatException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/apk/ApkSigningBlockNotFoundException.java b/apksigner/src/main/java/com/android/apksig/apk/ApkSigningBlockNotFoundException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/apk/ApkSigningBlockNotFoundException.java
rename to apksigner/src/main/java/com/android/apksig/apk/ApkSigningBlockNotFoundException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/apk/ApkUtils.java b/apksigner/src/main/java/com/android/apksig/apk/ApkUtils.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/apk/ApkUtils.java
rename to apksigner/src/main/java/com/android/apksig/apk/ApkUtils.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/apk/CodenameMinSdkVersionException.java b/apksigner/src/main/java/com/android/apksig/apk/CodenameMinSdkVersionException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/apk/CodenameMinSdkVersionException.java
rename to apksigner/src/main/java/com/android/apksig/apk/CodenameMinSdkVersionException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/apk/MinSdkVersionException.java b/apksigner/src/main/java/com/android/apksig/apk/MinSdkVersionException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/apk/MinSdkVersionException.java
rename to apksigner/src/main/java/com/android/apksig/apk/MinSdkVersionException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/Supplier.java b/apksigner/src/main/java/com/android/apksig/internal/Supplier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/Supplier.java
rename to apksigner/src/main/java/com/android/apksig/internal/Supplier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java b/apksigner/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java b/apksigner/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/ContentDigestAlgorithm.java b/apksigner/src/main/java/com/android/apksig/internal/apk/ContentDigestAlgorithm.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/ContentDigestAlgorithm.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/ContentDigestAlgorithm.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/SignatureAlgorithm.java b/apksigner/src/main/java/com/android/apksig/internal/apk/SignatureAlgorithm.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/SignatureAlgorithm.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/SignatureAlgorithm.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/SignatureInfo.java b/apksigner/src/main/java/com/android/apksig/internal/apk/SignatureInfo.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/SignatureInfo.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/SignatureInfo.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v1/DigestAlgorithm.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v1/DigestAlgorithm.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v1/DigestAlgorithm.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v1/DigestAlgorithm.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeSigner.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeSigner.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeSigner.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeSigner.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeVerifier.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeVerifier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeVerifier.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeVerifier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeSigner.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeSigner.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeSigner.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeSigner.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeVerifier.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeVerifier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeVerifier.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SchemeVerifier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SigningCertificateLineage.java b/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SigningCertificateLineage.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SigningCertificateLineage.java
rename to apksigner/src/main/java/com/android/apksig/internal/apk/v3/V3SigningCertificateLineage.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1BerParser.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1BerParser.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1BerParser.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1BerParser.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Class.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Class.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Class.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Class.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DecodingException.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DecodingException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DecodingException.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DecodingException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DerEncoder.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DerEncoder.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DerEncoder.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1DerEncoder.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1EncodingException.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1EncodingException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1EncodingException.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1EncodingException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Field.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Field.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Field.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Field.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1OpaqueObject.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1OpaqueObject.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1OpaqueObject.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1OpaqueObject.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1TagClass.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1TagClass.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1TagClass.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1TagClass.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Tagging.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Tagging.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Tagging.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Tagging.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Type.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Type.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Type.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/Asn1Type.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValue.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValue.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValue.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValue.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueFormatException.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueFormatException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueFormatException.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueFormatException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueReader.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueReader.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueReader.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerDataValueReader.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerEncoding.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerEncoding.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerEncoding.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/ber/BerEncoding.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/ByteBufferBerDataValueReader.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/ByteBufferBerDataValueReader.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/ByteBufferBerDataValueReader.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/ber/ByteBufferBerDataValueReader.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReader.java b/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReader.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReader.java
rename to apksigner/src/main/java/com/android/apksig/internal/asn1/ber/InputStreamBerDataValueReader.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/jar/ManifestParser.java b/apksigner/src/main/java/com/android/apksig/internal/jar/ManifestParser.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/jar/ManifestParser.java
rename to apksigner/src/main/java/com/android/apksig/internal/jar/ManifestParser.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/jar/ManifestWriter.java b/apksigner/src/main/java/com/android/apksig/internal/jar/ManifestWriter.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/jar/ManifestWriter.java
rename to apksigner/src/main/java/com/android/apksig/internal/jar/ManifestWriter.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/jar/SignatureFileWriter.java b/apksigner/src/main/java/com/android/apksig/internal/jar/SignatureFileWriter.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/jar/SignatureFileWriter.java
rename to apksigner/src/main/java/com/android/apksig/internal/jar/SignatureFileWriter.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/AlgorithmIdentifier.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/AlgorithmIdentifier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/AlgorithmIdentifier.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/AlgorithmIdentifier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Attribute.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Attribute.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Attribute.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/Attribute.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/ContentInfo.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/ContentInfo.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/ContentInfo.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/ContentInfo.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/EncapsulatedContentInfo.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/EncapsulatedContentInfo.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/EncapsulatedContentInfo.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/EncapsulatedContentInfo.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/IssuerAndSerialNumber.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/IssuerAndSerialNumber.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/IssuerAndSerialNumber.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/IssuerAndSerialNumber.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7Constants.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7Constants.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7Constants.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7Constants.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7DecodingException.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7DecodingException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7DecodingException.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/Pkcs7DecodingException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignedData.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignedData.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignedData.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignedData.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerIdentifier.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerIdentifier.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerIdentifier.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerIdentifier.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerInfo.java b/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerInfo.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerInfo.java
rename to apksigner/src/main/java/com/android/apksig/internal/pkcs7/SignerInfo.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/AndroidSdkVersion.java b/apksigner/src/main/java/com/android/apksig/internal/util/AndroidSdkVersion.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/AndroidSdkVersion.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/AndroidSdkVersion.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/Base64.java b/apksigner/src/main/java/com/android/apksig/internal/util/Base64.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/Base64.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/Base64.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteArrayDataSink.java b/apksigner/src/main/java/com/android/apksig/internal/util/ByteArrayDataSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteArrayDataSink.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/ByteArrayDataSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferDataSource.java b/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferDataSource.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferDataSource.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferDataSource.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferSink.java b/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferSink.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferUtils.java b/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferUtils.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferUtils.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/ByteBufferUtils.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteStreams.java b/apksigner/src/main/java/com/android/apksig/internal/util/ByteStreams.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/ByteStreams.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/ByteStreams.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/ChainedDataSource.java b/apksigner/src/main/java/com/android/apksig/internal/util/ChainedDataSource.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/ChainedDataSource.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/ChainedDataSource.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/DelegatingX509Certificate.java b/apksigner/src/main/java/com/android/apksig/internal/util/DelegatingX509Certificate.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/DelegatingX509Certificate.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/DelegatingX509Certificate.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/FileChannelDataSource.java b/apksigner/src/main/java/com/android/apksig/internal/util/FileChannelDataSource.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/FileChannelDataSource.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/FileChannelDataSource.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/GuaranteedEncodedFormX509Certificate.java b/apksigner/src/main/java/com/android/apksig/internal/util/GuaranteedEncodedFormX509Certificate.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/GuaranteedEncodedFormX509Certificate.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/GuaranteedEncodedFormX509Certificate.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/InclusiveIntRange.java b/apksigner/src/main/java/com/android/apksig/internal/util/InclusiveIntRange.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/InclusiveIntRange.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/InclusiveIntRange.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/MessageDigestSink.java b/apksigner/src/main/java/com/android/apksig/internal/util/MessageDigestSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/MessageDigestSink.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/MessageDigestSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/OutputStreamDataSink.java b/apksigner/src/main/java/com/android/apksig/internal/util/OutputStreamDataSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/OutputStreamDataSink.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/OutputStreamDataSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/Pair.java b/apksigner/src/main/java/com/android/apksig/internal/util/Pair.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/Pair.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/Pair.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/RandomAccessFileDataSink.java b/apksigner/src/main/java/com/android/apksig/internal/util/RandomAccessFileDataSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/RandomAccessFileDataSink.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/RandomAccessFileDataSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/TeeDataSink.java b/apksigner/src/main/java/com/android/apksig/internal/util/TeeDataSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/TeeDataSink.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/TeeDataSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/VerityTreeBuilder.java b/apksigner/src/main/java/com/android/apksig/internal/util/VerityTreeBuilder.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/VerityTreeBuilder.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/VerityTreeBuilder.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/util/X509CertificateUtils.java b/apksigner/src/main/java/com/android/apksig/internal/util/X509CertificateUtils.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/util/X509CertificateUtils.java
rename to apksigner/src/main/java/com/android/apksig/internal/util/X509CertificateUtils.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/AttributeTypeAndValue.java b/apksigner/src/main/java/com/android/apksig/internal/x509/AttributeTypeAndValue.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/AttributeTypeAndValue.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/AttributeTypeAndValue.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/Certificate.java b/apksigner/src/main/java/com/android/apksig/internal/x509/Certificate.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/Certificate.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/Certificate.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/Extension.java b/apksigner/src/main/java/com/android/apksig/internal/x509/Extension.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/Extension.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/Extension.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/Name.java b/apksigner/src/main/java/com/android/apksig/internal/x509/Name.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/Name.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/Name.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/RSAPublicKey.java b/apksigner/src/main/java/com/android/apksig/internal/x509/RSAPublicKey.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/RSAPublicKey.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/RSAPublicKey.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/RelativeDistinguishedName.java b/apksigner/src/main/java/com/android/apksig/internal/x509/RelativeDistinguishedName.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/RelativeDistinguishedName.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/RelativeDistinguishedName.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/SubjectPublicKeyInfo.java b/apksigner/src/main/java/com/android/apksig/internal/x509/SubjectPublicKeyInfo.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/SubjectPublicKeyInfo.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/SubjectPublicKeyInfo.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/TBSCertificate.java b/apksigner/src/main/java/com/android/apksig/internal/x509/TBSCertificate.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/TBSCertificate.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/TBSCertificate.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/Time.java b/apksigner/src/main/java/com/android/apksig/internal/x509/Time.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/Time.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/Time.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/x509/Validity.java b/apksigner/src/main/java/com/android/apksig/internal/x509/Validity.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/x509/Validity.java
rename to apksigner/src/main/java/com/android/apksig/internal/x509/Validity.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/zip/CentralDirectoryRecord.java b/apksigner/src/main/java/com/android/apksig/internal/zip/CentralDirectoryRecord.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/zip/CentralDirectoryRecord.java
rename to apksigner/src/main/java/com/android/apksig/internal/zip/CentralDirectoryRecord.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/zip/EocdRecord.java b/apksigner/src/main/java/com/android/apksig/internal/zip/EocdRecord.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/zip/EocdRecord.java
rename to apksigner/src/main/java/com/android/apksig/internal/zip/EocdRecord.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/zip/LocalFileRecord.java b/apksigner/src/main/java/com/android/apksig/internal/zip/LocalFileRecord.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/zip/LocalFileRecord.java
rename to apksigner/src/main/java/com/android/apksig/internal/zip/LocalFileRecord.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/internal/zip/ZipUtils.java b/apksigner/src/main/java/com/android/apksig/internal/zip/ZipUtils.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/internal/zip/ZipUtils.java
rename to apksigner/src/main/java/com/android/apksig/internal/zip/ZipUtils.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/DataSink.java b/apksigner/src/main/java/com/android/apksig/util/DataSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/DataSink.java
rename to apksigner/src/main/java/com/android/apksig/util/DataSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/DataSinks.java b/apksigner/src/main/java/com/android/apksig/util/DataSinks.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/DataSinks.java
rename to apksigner/src/main/java/com/android/apksig/util/DataSinks.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/DataSource.java b/apksigner/src/main/java/com/android/apksig/util/DataSource.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/DataSource.java
rename to apksigner/src/main/java/com/android/apksig/util/DataSource.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/DataSources.java b/apksigner/src/main/java/com/android/apksig/util/DataSources.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/DataSources.java
rename to apksigner/src/main/java/com/android/apksig/util/DataSources.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/ReadableDataSink.java b/apksigner/src/main/java/com/android/apksig/util/ReadableDataSink.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/ReadableDataSink.java
rename to apksigner/src/main/java/com/android/apksig/util/ReadableDataSink.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/RunnablesExecutor.java b/apksigner/src/main/java/com/android/apksig/util/RunnablesExecutor.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/RunnablesExecutor.java
rename to apksigner/src/main/java/com/android/apksig/util/RunnablesExecutor.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/util/RunnablesProvider.java b/apksigner/src/main/java/com/android/apksig/util/RunnablesProvider.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/util/RunnablesProvider.java
rename to apksigner/src/main/java/com/android/apksig/util/RunnablesProvider.java
diff --git a/loader/apksigner/src/main/java/com/android/apksig/zip/ZipFormatException.java b/apksigner/src/main/java/com/android/apksig/zip/ZipFormatException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksig/zip/ZipFormatException.java
rename to apksigner/src/main/java/com/android/apksig/zip/ZipFormatException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/ApkSignerTool.java b/apksigner/src/main/java/com/android/apksigner/ApkSignerTool.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/ApkSignerTool.java
rename to apksigner/src/main/java/com/android/apksigner/ApkSignerTool.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/HexEncoding.java b/apksigner/src/main/java/com/android/apksigner/HexEncoding.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/HexEncoding.java
rename to apksigner/src/main/java/com/android/apksigner/HexEncoding.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/OptionsParser.java b/apksigner/src/main/java/com/android/apksigner/OptionsParser.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/OptionsParser.java
rename to apksigner/src/main/java/com/android/apksigner/OptionsParser.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/ParameterException.java b/apksigner/src/main/java/com/android/apksigner/ParameterException.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/ParameterException.java
rename to apksigner/src/main/java/com/android/apksigner/ParameterException.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/PasswordRetriever.java b/apksigner/src/main/java/com/android/apksigner/PasswordRetriever.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/PasswordRetriever.java
rename to apksigner/src/main/java/com/android/apksigner/PasswordRetriever.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/SignerParams.java b/apksigner/src/main/java/com/android/apksigner/SignerParams.java
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/SignerParams.java
rename to apksigner/src/main/java/com/android/apksigner/SignerParams.java
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/help.txt b/apksigner/src/main/java/com/android/apksigner/help.txt
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/help.txt
rename to apksigner/src/main/java/com/android/apksigner/help.txt
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/help_lineage.txt b/apksigner/src/main/java/com/android/apksigner/help_lineage.txt
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/help_lineage.txt
rename to apksigner/src/main/java/com/android/apksigner/help_lineage.txt
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/help_rotate.txt b/apksigner/src/main/java/com/android/apksigner/help_rotate.txt
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/help_rotate.txt
rename to apksigner/src/main/java/com/android/apksigner/help_rotate.txt
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/help_sign.txt b/apksigner/src/main/java/com/android/apksigner/help_sign.txt
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/help_sign.txt
rename to apksigner/src/main/java/com/android/apksigner/help_sign.txt
diff --git a/loader/apksigner/src/main/java/com/android/apksigner/help_verify.txt b/apksigner/src/main/java/com/android/apksigner/help_verify.txt
similarity index 100%
rename from loader/apksigner/src/main/java/com/android/apksigner/help_verify.txt
rename to apksigner/src/main/java/com/android/apksigner/help_verify.txt
diff --git a/loader/app/.gitignore b/app/.gitignore
similarity index 100%
rename from loader/app/.gitignore
rename to app/.gitignore
diff --git a/loader/app/build.gradle b/app/build.gradle
similarity index 100%
rename from loader/app/build.gradle
rename to app/build.gradle
diff --git a/loader/app/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from loader/app/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/loader/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from loader/app/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/loader/app/src/main/assets/original_signature_info.ini b/app/src/main/assets/original_signature_info.ini
similarity index 100%
rename from loader/app/src/main/assets/original_signature_info.ini
rename to app/src/main/assets/original_signature_info.ini
diff --git a/loader/app/src/main/java/com/storm/wind/xposed/MainActivity.java b/app/src/main/java/com/storm/wind/xposed/MainActivity.java
similarity index 100%
rename from loader/app/src/main/java/com/storm/wind/xposed/MainActivity.java
rename to app/src/main/java/com/storm/wind/xposed/MainActivity.java
diff --git a/loader/app/src/main/java/com/storm/wind/xposed/XposedApplication.java b/app/src/main/java/com/storm/wind/xposed/XposedApplication.java
similarity index 100%
rename from loader/app/src/main/java/com/storm/wind/xposed/XposedApplication.java
rename to app/src/main/java/com/storm/wind/xposed/XposedApplication.java
diff --git a/loader/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from loader/app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/loader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from loader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/loader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from loader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/loader/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from loader/app/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/loader/axmlprinter/.gitignore b/axmlprinter/.gitignore
similarity index 100%
rename from loader/axmlprinter/.gitignore
rename to axmlprinter/.gitignore
diff --git a/loader/axmlprinter/build.gradle b/axmlprinter/build.gradle
similarity index 100%
rename from loader/axmlprinter/build.gradle
rename to axmlprinter/build.gradle
diff --git a/loader/axmlprinter/src/main/java/wind/android/content/res/AXmlResourceParser.java b/axmlprinter/src/main/java/wind/android/content/res/AXmlResourceParser.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/content/res/AXmlResourceParser.java
rename to axmlprinter/src/main/java/wind/android/content/res/AXmlResourceParser.java
diff --git a/loader/axmlprinter/src/main/java/wind/android/content/res/ChunkUtil.java b/axmlprinter/src/main/java/wind/android/content/res/ChunkUtil.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/content/res/ChunkUtil.java
rename to axmlprinter/src/main/java/wind/android/content/res/ChunkUtil.java
diff --git a/loader/axmlprinter/src/main/java/wind/android/content/res/IntReader.java b/axmlprinter/src/main/java/wind/android/content/res/IntReader.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/content/res/IntReader.java
rename to axmlprinter/src/main/java/wind/android/content/res/IntReader.java
diff --git a/loader/axmlprinter/src/main/java/wind/android/content/res/StringBlock.java b/axmlprinter/src/main/java/wind/android/content/res/StringBlock.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/content/res/StringBlock.java
rename to axmlprinter/src/main/java/wind/android/content/res/StringBlock.java
diff --git a/loader/axmlprinter/src/main/java/wind/android/content/res/XmlResourceParser.java b/axmlprinter/src/main/java/wind/android/content/res/XmlResourceParser.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/content/res/XmlResourceParser.java
rename to axmlprinter/src/main/java/wind/android/content/res/XmlResourceParser.java
diff --git a/loader/axmlprinter/src/main/java/wind/android/util/AttributeSet.java b/axmlprinter/src/main/java/wind/android/util/AttributeSet.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/util/AttributeSet.java
rename to axmlprinter/src/main/java/wind/android/util/AttributeSet.java
diff --git a/loader/axmlprinter/src/main/java/wind/android/util/TypedValue.java b/axmlprinter/src/main/java/wind/android/util/TypedValue.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/android/util/TypedValue.java
rename to axmlprinter/src/main/java/wind/android/util/TypedValue.java
diff --git a/loader/axmlprinter/src/main/java/wind/test/AXMLPrinter.java b/axmlprinter/src/main/java/wind/test/AXMLPrinter.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/test/AXMLPrinter.java
rename to axmlprinter/src/main/java/wind/test/AXMLPrinter.java
diff --git a/loader/axmlprinter/src/main/java/wind/v1/XmlPullParser.java b/axmlprinter/src/main/java/wind/v1/XmlPullParser.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/v1/XmlPullParser.java
rename to axmlprinter/src/main/java/wind/v1/XmlPullParser.java
diff --git a/loader/axmlprinter/src/main/java/wind/v1/XmlPullParserException.java b/axmlprinter/src/main/java/wind/v1/XmlPullParserException.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/v1/XmlPullParserException.java
rename to axmlprinter/src/main/java/wind/v1/XmlPullParserException.java
diff --git a/loader/axmlprinter/src/main/java/wind/v1/XmlPullParserFactory.java b/axmlprinter/src/main/java/wind/v1/XmlPullParserFactory.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/v1/XmlPullParserFactory.java
rename to axmlprinter/src/main/java/wind/v1/XmlPullParserFactory.java
diff --git a/loader/axmlprinter/src/main/java/wind/v1/XmlSerializer.java b/axmlprinter/src/main/java/wind/v1/XmlSerializer.java
similarity index 100%
rename from loader/axmlprinter/src/main/java/wind/v1/XmlSerializer.java
rename to axmlprinter/src/main/java/wind/v1/XmlSerializer.java
diff --git a/loader/build.gradle b/build.gradle
similarity index 100%
rename from loader/build.gradle
rename to build.gradle
diff --git a/loader/core/.gitignore b/core/.gitignore
similarity index 100%
rename from loader/core/.gitignore
rename to core/.gitignore
diff --git a/loader/core/build.gradle b/core/build.gradle
similarity index 100%
rename from loader/core/build.gradle
rename to core/build.gradle
diff --git a/loader/core/proguard-rules.pro b/core/proguard-rules.pro
similarity index 100%
rename from loader/core/proguard-rules.pro
rename to core/proguard-rules.pro
diff --git a/loader/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
similarity index 100%
rename from loader/core/src/main/AndroidManifest.xml
rename to core/src/main/AndroidManifest.xml
diff --git a/loader/core/src/main/java/android/app/ActivityThread.java b/core/src/main/java/android/app/ActivityThread.java
similarity index 100%
rename from loader/core/src/main/java/android/app/ActivityThread.java
rename to core/src/main/java/android/app/ActivityThread.java
diff --git a/loader/core/src/main/java/android/app/LoadedApk.java b/core/src/main/java/android/app/LoadedApk.java
similarity index 100%
rename from loader/core/src/main/java/android/app/LoadedApk.java
rename to core/src/main/java/android/app/LoadedApk.java
diff --git a/loader/core/src/main/java/android/content/res/CompatibilityInfo.java b/core/src/main/java/android/content/res/CompatibilityInfo.java
similarity index 100%
rename from loader/core/src/main/java/android/content/res/CompatibilityInfo.java
rename to core/src/main/java/android/content/res/CompatibilityInfo.java
diff --git a/loader/core/src/main/java/com/wind/xposed/entry/MMPApplication.java b/core/src/main/java/com/wind/xposed/entry/MMPApplication.java
similarity index 100%
rename from loader/core/src/main/java/com/wind/xposed/entry/MMPApplication.java
rename to core/src/main/java/com/wind/xposed/entry/MMPApplication.java
diff --git a/loader/core/src/main/java/com/wind/xposed/entry/MMPLoader.java b/core/src/main/java/com/wind/xposed/entry/MMPLoader.java
similarity index 100%
rename from loader/core/src/main/java/com/wind/xposed/entry/MMPLoader.java
rename to core/src/main/java/com/wind/xposed/entry/MMPLoader.java
diff --git a/loader/core/src/main/java/com/wind/xposed/entry/util/FileUtils.java b/core/src/main/java/com/wind/xposed/entry/util/FileUtils.java
similarity index 100%
rename from loader/core/src/main/java/com/wind/xposed/entry/util/FileUtils.java
rename to core/src/main/java/com/wind/xposed/entry/util/FileUtils.java
diff --git a/loader/core/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java b/core/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java
similarity index 100%
rename from loader/core/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java
rename to core/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java
diff --git a/loader/core/src/main/java/com/wind/xposed/entry/util/XLog.java b/core/src/main/java/com/wind/xposed/entry/util/XLog.java
similarity index 100%
rename from loader/core/src/main/java/com/wind/xposed/entry/util/XLog.java
rename to core/src/main/java/com/wind/xposed/entry/util/XLog.java
diff --git a/loader/core/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java b/core/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java
similarity index 100%
rename from loader/core/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java
rename to core/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java
diff --git a/loader/core/src/main/java/de/robv/android/xposed/XposedHelper.java b/core/src/main/java/de/robv/android/xposed/XposedHelper.java
similarity index 100%
rename from loader/core/src/main/java/de/robv/android/xposed/XposedHelper.java
rename to core/src/main/java/de/robv/android/xposed/XposedHelper.java
diff --git a/loader/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
similarity index 100%
rename from loader/core/src/main/res/values/strings.xml
rename to core/src/main/res/values/strings.xml
diff --git a/loader/gradle.properties b/gradle.properties
similarity index 100%
rename from loader/gradle.properties
rename to gradle.properties
diff --git a/loader/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from loader/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/loader/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from loader/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/loader/gradlew b/gradlew
similarity index 100%
rename from loader/gradlew
rename to gradlew
diff --git a/loader/gradlew.bat b/gradlew.bat
similarity index 100%
rename from loader/gradlew.bat
rename to gradlew.bat
diff --git a/loader/patch/.gitignore b/patch/.gitignore
similarity index 100%
rename from loader/patch/.gitignore
rename to patch/.gitignore
diff --git a/loader/patch/build.gradle b/patch/build.gradle
similarity index 100%
rename from loader/patch/build.gradle
rename to patch/build.gradle
diff --git a/loader/patch/libs/ManifestEditor-1.0.1.jar b/patch/libs/ManifestEditor-1.0.1.jar
similarity index 100%
rename from loader/patch/libs/ManifestEditor-1.0.1.jar
rename to patch/libs/ManifestEditor-1.0.1.jar
diff --git a/loader/patch/libs/dex-tools-2.1-SNAPSHOT.jar b/patch/libs/dex-tools-2.1-SNAPSHOT.jar
similarity index 100%
rename from loader/patch/libs/dex-tools-2.1-SNAPSHOT.jar
rename to patch/libs/dex-tools-2.1-SNAPSHOT.jar
diff --git a/loader/patch/src/main/assets/android.keystore b/patch/src/main/assets/android.keystore
similarity index 100%
rename from loader/patch/src/main/assets/android.keystore
rename to patch/src/main/assets/android.keystore
diff --git a/loader/patch/src/main/assets/keystore b/patch/src/main/assets/keystore
similarity index 100%
rename from loader/patch/src/main/assets/keystore
rename to patch/src/main/assets/keystore
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/MainCommand.java b/patch/src/main/java/com/storm/wind/xpatch/MainCommand.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/MainCommand.java
rename to patch/src/main/java/com/storm/wind/xpatch/MainCommand.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/base/BaseCommand.java b/patch/src/main/java/com/storm/wind/xpatch/base/BaseCommand.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/base/BaseCommand.java
rename to patch/src/main/java/com/storm/wind/xpatch/base/BaseCommand.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/task/ApkModifyTask.java b/patch/src/main/java/com/storm/wind/xpatch/task/ApkModifyTask.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/task/ApkModifyTask.java
rename to patch/src/main/java/com/storm/wind/xpatch/task/ApkModifyTask.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java b/patch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java
rename to patch/src/main/java/com/storm/wind/xpatch/task/BuildAndSignApkTask.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/task/SaveApkSignatureTask.java b/patch/src/main/java/com/storm/wind/xpatch/task/SaveApkSignatureTask.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/task/SaveApkSignatureTask.java
rename to patch/src/main/java/com/storm/wind/xpatch/task/SaveApkSignatureTask.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/task/SaveOriginalApplicationNameTask.java b/patch/src/main/java/com/storm/wind/xpatch/task/SaveOriginalApplicationNameTask.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/task/SaveOriginalApplicationNameTask.java
rename to patch/src/main/java/com/storm/wind/xpatch/task/SaveOriginalApplicationNameTask.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/task/SoAndDexCopyTask.java b/patch/src/main/java/com/storm/wind/xpatch/task/SoAndDexCopyTask.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/task/SoAndDexCopyTask.java
rename to patch/src/main/java/com/storm/wind/xpatch/task/SoAndDexCopyTask.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/util/ApkSignatureHelper.java b/patch/src/main/java/com/storm/wind/xpatch/util/ApkSignatureHelper.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/util/ApkSignatureHelper.java
rename to patch/src/main/java/com/storm/wind/xpatch/util/ApkSignatureHelper.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/util/FileUtils.java b/patch/src/main/java/com/storm/wind/xpatch/util/FileUtils.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/util/FileUtils.java
rename to patch/src/main/java/com/storm/wind/xpatch/util/FileUtils.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/util/ManifestParser.java b/patch/src/main/java/com/storm/wind/xpatch/util/ManifestParser.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/util/ManifestParser.java
rename to patch/src/main/java/com/storm/wind/xpatch/util/ManifestParser.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/util/ReflectUtils.java b/patch/src/main/java/com/storm/wind/xpatch/util/ReflectUtils.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/util/ReflectUtils.java
rename to patch/src/main/java/com/storm/wind/xpatch/util/ReflectUtils.java
diff --git a/loader/patch/src/main/java/com/storm/wind/xpatch/util/ShellCmdUtil.java b/patch/src/main/java/com/storm/wind/xpatch/util/ShellCmdUtil.java
similarity index 100%
rename from loader/patch/src/main/java/com/storm/wind/xpatch/util/ShellCmdUtil.java
rename to patch/src/main/java/com/storm/wind/xpatch/util/ShellCmdUtil.java
diff --git a/loader/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java
similarity index 100%
rename from loader/patch/src/main/java/org/lsposed/patch/LSPatch.java
rename to patch/src/main/java/org/lsposed/patch/LSPatch.java
diff --git a/loader/settings.gradle b/settings.gradle
similarity index 100%
rename from loader/settings.gradle
rename to settings.gradle