diff --git a/app/src/main/cpp/xdelta3.c b/app/src/main/cpp/xdelta3.c
index 168367e..a02e5f5 100644
--- a/app/src/main/cpp/xdelta3.c
+++ b/app/src/main/cpp/xdelta3.c
@@ -37,7 +37,7 @@ const int ERR_UNABLE_OPEN_ROM = -5002;
 const int ERR_UNABLE_OPEN_OUTPUT = -5003;
 const int ERR_WRONG_CHECKSUM = -5010;
 
-int Java_org_emunix_unipatcher_patch_XDelta_xdelta3apply(JNIEnv *env,
+int Java_org_emunix_unipatcher_patcher_XDelta_xdelta3apply(JNIEnv *env,
                                                          jobject this,
                                                          jstring patchPath,
                                                          jstring romPath,
diff --git a/app/src/main/java/org/emunix/unipatcher/WorkerService.java b/app/src/main/java/org/emunix/unipatcher/WorkerService.java
index 2c6a85e..5cb7459 100644
--- a/app/src/main/java/org/emunix/unipatcher/WorkerService.java
+++ b/app/src/main/java/org/emunix/unipatcher/WorkerService.java
@@ -29,16 +29,16 @@ import android.support.v4.app.NotificationCompat;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.emunix.unipatcher.patch.APS;
-import org.emunix.unipatcher.patch.BPS;
-import org.emunix.unipatcher.patch.DPS;
-import org.emunix.unipatcher.patch.EBP;
-import org.emunix.unipatcher.patch.IPS;
-import org.emunix.unipatcher.patch.PPF;
-import org.emunix.unipatcher.patch.Patch;
-import org.emunix.unipatcher.patch.PatchException;
-import org.emunix.unipatcher.patch.UPS;
-import org.emunix.unipatcher.patch.XDelta;
+import org.emunix.unipatcher.patcher.APS;
+import org.emunix.unipatcher.patcher.BPS;
+import org.emunix.unipatcher.patcher.DPS;
+import org.emunix.unipatcher.patcher.EBP;
+import org.emunix.unipatcher.patcher.IPS;
+import org.emunix.unipatcher.patcher.PPF;
+import org.emunix.unipatcher.patcher.Patcher;
+import org.emunix.unipatcher.patcher.PatchException;
+import org.emunix.unipatcher.patcher.UPS;
+import org.emunix.unipatcher.patcher.XDelta;
 import org.emunix.unipatcher.tools.RomException;
 import org.emunix.unipatcher.tools.SmdFixChecksum;
 import org.emunix.unipatcher.tools.SnesSmcHeader;
@@ -97,7 +97,7 @@ public class WorkerService extends IntentService {
         File romFile = new File(intent.getStringExtra("romPath"));
         File patchFile = new File(intent.getStringExtra("patchPath"));
         File outputFile = new File(intent.getStringExtra("outputPath"));
-        Patch patcher = null;
+        Patcher patcher = null;
 
         if (!fileExists(patchFile) || !fileExists(romFile))
             return;
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/APS.java b/app/src/main/java/org/emunix/unipatcher/patcher/APS.java
similarity index 96%
rename from app/src/main/java/org/emunix/unipatcher/patch/APS.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/APS.java
index 2e5353b..5c2f9be 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/APS.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/APS.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -29,7 +29,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
-public class APS extends Patch {
+public class APS extends Patcher {
 
     public static final int NOT_APS_PATCH = 0;
     public static final int APS_N64_PATCH = 1;
@@ -44,7 +44,7 @@ public class APS extends Patch {
 
     @Override
     public void apply() throws PatchException, IOException {
-        Patch aps = null;
+        Patcher aps = null;
         switch (checkAPS(patchFile)) {
             case APS_N64_PATCH:
                 aps = new APS_N64(context, patchFile, romFile, outputFile);
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/APS_GBA.java b/app/src/main/java/org/emunix/unipatcher/patcher/APS_GBA.java
similarity index 99%
rename from app/src/main/java/org/emunix/unipatcher/patch/APS_GBA.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/APS_GBA.java
index 90d1202..1fd36cf 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/APS_GBA.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/APS_GBA.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -33,7 +33,7 @@ import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.util.Arrays;
 
-public class APS_GBA extends Patch {
+public class APS_GBA extends Patcher {
     private static final byte[] MAGIC_NUMBER = {0x41, 0x50, 0x53, 0x31}; // APS1
     private static final int CHUNK_SIZE = 65536;
 
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/APS_N64.java b/app/src/main/java/org/emunix/unipatcher/patcher/APS_N64.java
similarity index 99%
rename from app/src/main/java/org/emunix/unipatcher/patch/APS_N64.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/APS_N64.java
index fcb0e10..2faa42a 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/APS_N64.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/APS_N64.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -35,7 +35,7 @@ import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.util.Arrays;
 
-public class APS_N64 extends Patch {
+public class APS_N64 extends Patcher {
 
     private static final byte[] MAGIC_NUMBER = {0x41, 0x50, 0x53, 0x31, 0x30}; // APS10
     private static final int TYPE_SIMPLE_PATCH = 0;
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/BPS.java b/app/src/main/java/org/emunix/unipatcher/patcher/BPS.java
similarity index 99%
rename from app/src/main/java/org/emunix/unipatcher/patch/BPS.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/BPS.java
index 5fbb221..46719ff 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/BPS.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/BPS.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -35,7 +35,7 @@ import java.nio.channels.FileChannel;
 import java.util.Arrays;
 import java.util.zip.CRC32;
 
-public class BPS extends Patch {
+public class BPS extends Patcher {
 
     private static final byte[] MAGIC_NUMBER = {0x42, 0x50, 0x53, 0x31}; // "BPS1"
     private static final byte SOURCE_READ = 0b00;
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/DPS.java b/app/src/main/java/org/emunix/unipatcher/patcher/DPS.java
similarity index 98%
rename from app/src/main/java/org/emunix/unipatcher/patch/DPS.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/DPS.java
index 59351ea..bcf60a7 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/DPS.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/DPS.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -30,7 +30,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-public class DPS extends Patch {
+public class DPS extends Patcher {
 
     private static final int MIN_SIZE_PATCH = 136;
     private static final int BUFFER_SIZE = 32768;
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/EBP.java b/app/src/main/java/org/emunix/unipatcher/patcher/EBP.java
similarity index 99%
rename from app/src/main/java/org/emunix/unipatcher/patch/EBP.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/EBP.java
index 9a66ad4..fb3457b 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/EBP.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/EBP.java
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -45,7 +45,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.HashMap;
 
-public class EBP extends Patch {
+public class EBP extends Patcher {
 
     private static final byte[] MAGIC_NUMBER = {0x50, 0x41, 0x54, 0x43, 0x48}; // "PATCH"
     private static final byte[] EARTH_BOUND = {0x45, 0x41, 0x52, 0x54, 0x48, 0x20, 0x42, 0x4f, 0x55, 0x4e, 0x44};
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/IPS.java b/app/src/main/java/org/emunix/unipatcher/patcher/IPS.java
similarity index 98%
rename from app/src/main/java/org/emunix/unipatcher/patch/IPS.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/IPS.java
index eecc34d..7e7871d 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/IPS.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/IPS.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -34,7 +34,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 
-public class IPS extends Patch {
+public class IPS extends Patcher {
 
     private static final byte[] MAGIC_NUMBER = {0x50, 0x41, 0x54, 0x43, 0x48}; // "PATCH"
 
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/PPF.java b/app/src/main/java/org/emunix/unipatcher/patcher/PPF.java
similarity index 99%
rename from app/src/main/java/org/emunix/unipatcher/patch/PPF.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/PPF.java
index 2b164e4..1bc5005 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/PPF.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/PPF.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -30,7 +30,7 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.Arrays;
 
-public class PPF extends Patch {
+public class PPF extends Patcher {
 
     private static final byte[] MAGIC_NUMBER = {0x50, 0x50, 0x46}; // "PPF" without version
 
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/PatchException.java b/app/src/main/java/org/emunix/unipatcher/patcher/PatchException.java
similarity index 95%
rename from app/src/main/java/org/emunix/unipatcher/patch/PatchException.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/PatchException.java
index 334ecf1..697551c 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/PatchException.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/PatchException.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 public class PatchException extends Exception {
 
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/Patch.java b/app/src/main/java/org/emunix/unipatcher/patcher/Patcher.java
similarity index 88%
rename from app/src/main/java/org/emunix/unipatcher/patch/Patch.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/Patcher.java
index 50a95f9..bbadf2e 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/Patch.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/Patcher.java
@@ -17,20 +17,20 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
 import java.io.File;
 import java.io.IOException;
 
-public abstract class Patch {
+public abstract class Patcher {
     protected File patchFile = null;
     protected File romFile = null;
     protected File outputFile = null;
     protected Context context = null;
 
-    public Patch(Context c, File patch, File rom, File output) {
+    public Patcher(Context c, File patch, File rom, File output) {
         context = c;
         patchFile = patch;
         romFile = rom;
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/UPS.java b/app/src/main/java/org/emunix/unipatcher/patcher/UPS.java
similarity index 99%
rename from app/src/main/java/org/emunix/unipatcher/patch/UPS.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/UPS.java
index 7043d62..9383dec 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/UPS.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/UPS.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -35,7 +35,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.zip.CRC32;
 
-public class UPS extends Patch {
+public class UPS extends Patcher {
 
     private static final byte[] MAGIC_NUMBER = {0x55, 0x50, 0x53, 0x31}; // "UPS1"
 
diff --git a/app/src/main/java/org/emunix/unipatcher/patch/XDelta.java b/app/src/main/java/org/emunix/unipatcher/patcher/XDelta.java
similarity index 97%
rename from app/src/main/java/org/emunix/unipatcher/patch/XDelta.java
rename to app/src/main/java/org/emunix/unipatcher/patcher/XDelta.java
index 73c1681..970a1fb 100644
--- a/app/src/main/java/org/emunix/unipatcher/patch/XDelta.java
+++ b/app/src/main/java/org/emunix/unipatcher/patcher/XDelta.java
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
@@ -29,7 +29,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
-public class XDelta extends Patch {
+public class XDelta extends Patcher {
 
     private static final int NO_ERROR = 0;
     private static final int ERR_UNABLE_OPEN_PATCH = -5001;
diff --git a/app/src/test/java/org/emunix/unipatcher/patch/BPSTest.java b/app/src/test/java/org/emunix/unipatcher/patcher/BPSTest.java
similarity index 97%
rename from app/src/test/java/org/emunix/unipatcher/patch/BPSTest.java
rename to app/src/test/java/org/emunix/unipatcher/patcher/BPSTest.java
index 13b8c5c..947a5e4 100644
--- a/app/src/test/java/org/emunix/unipatcher/patch/BPSTest.java
+++ b/app/src/test/java/org/emunix/unipatcher/patcher/BPSTest.java
@@ -1,4 +1,4 @@
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
diff --git a/app/src/test/java/org/emunix/unipatcher/patch/IPSTest.java b/app/src/test/java/org/emunix/unipatcher/patcher/IPSTest.java
similarity index 98%
rename from app/src/test/java/org/emunix/unipatcher/patch/IPSTest.java
rename to app/src/test/java/org/emunix/unipatcher/patcher/IPSTest.java
index 7f44702..6f3da76 100644
--- a/app/src/test/java/org/emunix/unipatcher/patch/IPSTest.java
+++ b/app/src/test/java/org/emunix/unipatcher/patcher/IPSTest.java
@@ -1,4 +1,4 @@
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;
 
diff --git a/app/src/test/java/org/emunix/unipatcher/patch/UPSTest.java b/app/src/test/java/org/emunix/unipatcher/patcher/UPSTest.java
similarity index 98%
rename from app/src/test/java/org/emunix/unipatcher/patch/UPSTest.java
rename to app/src/test/java/org/emunix/unipatcher/patcher/UPSTest.java
index a323d9e..f2b3adf 100644
--- a/app/src/test/java/org/emunix/unipatcher/patch/UPSTest.java
+++ b/app/src/test/java/org/emunix/unipatcher/patcher/UPSTest.java
@@ -1,4 +1,4 @@
-package org.emunix.unipatcher.patch;
+package org.emunix.unipatcher.patcher;
 
 import android.content.Context;