diff --git a/libs/README.md b/libs/README.md
index 504e763d..8112e98b 100644
--- a/libs/README.md
+++ b/libs/README.md
@@ -19,5 +19,6 @@ Some dependencies may have been modified or could be released by their author in
 
 #### Modifications
 
+ - `ByteAnalysis`: Compiled from source with the newest dependency versions
+ - `APKTool`: Added the `apktool-cli` subproject, compiled without changes from source
  - `JD-GUI`: Removed ASM, RSyntaxTextArea, ANTLR, and TreeLayout
- - `APKTool`: Recompiled with the newest dependency versions, removed prebuilt folder
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar
new file mode 100644
index 00000000..556872cc
Binary files /dev/null and b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar differ
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.md5 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.md5
new file mode 100644
index 00000000..45d4fc3d
--- /dev/null
+++ b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.md5
@@ -0,0 +1 @@
+92750a855f488f5b90b4ee75352d53cc
\ No newline at end of file
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.sha1 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.sha1
new file mode 100644
index 00000000..efa647e2
--- /dev/null
+++ b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.sha1
@@ -0,0 +1 @@
+f84f12d4a024aa00fa314229c748c971c984f8ae
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom
similarity index 83%
rename from libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom
rename to libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom
index 8e9dd343..8501e901 100644
--- a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom
+++ b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom
@@ -3,6 +3,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apktool</groupId>
-  <artifactId>apktool</artifactId>
-  <version>2.5.0bcv2</version>
+  <artifactId>apktool-cli</artifactId>
+  <version>2.6.0</version>
 </project>
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.md5 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.md5
new file mode 100644
index 00000000..8d7a1c84
--- /dev/null
+++ b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.md5
@@ -0,0 +1 @@
+32d7606cd2e4eb5ec99cf13a1f623a2c
\ No newline at end of file
diff --git a/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.sha1 b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.sha1
new file mode 100644
index 00000000..6e5d5881
--- /dev/null
+++ b/libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.sha1
@@ -0,0 +1 @@
+b7c5e3e3a20e7601b18d45f594ecaf0d31e0047c
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/maven-metadata.xml b/libs/org/apktool/apktool-cli/maven-metadata.xml
similarity index 51%
rename from libs/org/apktool/apktool/maven-metadata.xml
rename to libs/org/apktool/apktool-cli/maven-metadata.xml
index 25ecaadd..913576ca 100644
--- a/libs/org/apktool/apktool/maven-metadata.xml
+++ b/libs/org/apktool/apktool-cli/maven-metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>org.apktool</groupId>
-  <artifactId>apktool</artifactId>
+  <artifactId>apktool-cli</artifactId>
   <versioning>
-    <release>2.5.0bcv2</release>
+    <release>2.6.0</release>
     <versions>
-      <version>2.5.0bcv2</version>
+      <version>2.6.0</version>
     </versions>
-    <lastUpdated>20210622201718</lastUpdated>
+    <lastUpdated>20210916084410</lastUpdated>
   </versioning>
 </metadata>
diff --git a/libs/org/apktool/apktool-cli/maven-metadata.xml.md5 b/libs/org/apktool/apktool-cli/maven-metadata.xml.md5
new file mode 100644
index 00000000..9388c8f8
--- /dev/null
+++ b/libs/org/apktool/apktool-cli/maven-metadata.xml.md5
@@ -0,0 +1 @@
+5cf5e3c60d76f6bc05317852c0dee46c
\ No newline at end of file
diff --git a/libs/org/apktool/apktool-cli/maven-metadata.xml.sha1 b/libs/org/apktool/apktool-cli/maven-metadata.xml.sha1
new file mode 100644
index 00000000..65e6a541
--- /dev/null
+++ b/libs/org/apktool/apktool-cli/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+33442f1de71c010486efa6d68d221cecd8bf185e
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar b/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar
deleted file mode 100644
index 050dfbb2..00000000
Binary files a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar and /dev/null differ
diff --git a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar.md5 b/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar.md5
deleted file mode 100644
index bc05e1d4..00000000
--- a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-7d96a4ccc7289d0f0f476c618a6315a8
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar.sha1 b/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar.sha1
deleted file mode 100644
index 66e6dd8a..00000000
--- a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3aad98eee64a34566ae6b971b59a3fb27c897a5
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom.md5 b/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom.md5
deleted file mode 100644
index a387559b..00000000
--- a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-f13d5769cd41299e8727973044de6326
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom.sha1 b/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom.sha1
deleted file mode 100644
index 78ff89b0..00000000
--- a/libs/org/apktool/apktool/2.5.0bcv2/apktool-2.5.0bcv2.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8750ebdb9af548b87d7f4597f65ca49262de7033
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/maven-metadata.xml.md5 b/libs/org/apktool/apktool/maven-metadata.xml.md5
deleted file mode 100644
index 8f156188..00000000
--- a/libs/org/apktool/apktool/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-04af915c4a9139dff66855fe769239f1
\ No newline at end of file
diff --git a/libs/org/apktool/apktool/maven-metadata.xml.sha1 b/libs/org/apktool/apktool/maven-metadata.xml.sha1
deleted file mode 100644
index 153be995..00000000
--- a/libs/org/apktool/apktool/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1f365a9ab11f7213c747f379cf8d4220dc1b7fab
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e1c2c6c9..fa1ffab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
         <!-- Dependency versions -->
         <annotations.version>22.0.0</annotations.version>
-        <apktool.version>2.5.0bcv2</apktool.version>
+        <apktool.version>2.6.0</apktool.version>
         <asm.version>9.2</asm.version>
         <bined.version>0.2.0</bined.version>
         <cfr.version>0.151</cfr.version>
@@ -77,7 +77,12 @@
         </dependency>
         <dependency>
             <groupId>org.apktool</groupId>
-            <artifactId>apktool</artifactId>
+            <artifactId>apktool-cli</artifactId>
+            <version>${apktool.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apktool</groupId>
+            <artifactId>apktool-lib</artifactId>
             <version>${apktool.version}</version>
         </dependency>
         <dependency>