diff --git a/README.md b/README.md
index 105e552..ee37b65 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ This project is **kept in sync** with the utilities library, so "jar hell" is no
 <dependency>
   <groupId>com.dorkbox</groupId>
   <artifactId>PeParser</artifactId>
-  <version>1.2</version>
+  <version>2.0</version>
 </dependency>
 ```
 
@@ -31,3 +31,16 @@ https://oss.sonatype.org/content/repositories/releases/com/dorkbox/PeParser-Dork
 <h2>License</h2>
 
 This project is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further references.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/dorkbox/util/pe/ByteArray.java b/src/dorkbox/peParser/ByteArray.java
similarity index 98%
rename from src/dorkbox/util/pe/ByteArray.java
rename to src/dorkbox/peParser/ByteArray.java
index e32768d..ab36480 100644
--- a/src/dorkbox/util/pe/ByteArray.java
+++ b/src/dorkbox/peParser/ByteArray.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe;
+package dorkbox.peParser;
 
 import java.io.ByteArrayInputStream;
 
diff --git a/src/dorkbox/util/pe/DataLocation.java b/src/dorkbox/peParser/DataLocation.java
similarity index 97%
rename from src/dorkbox/util/pe/DataLocation.java
rename to src/dorkbox/peParser/DataLocation.java
index e3e2b10..fb1e94f 100644
--- a/src/dorkbox/util/pe/DataLocation.java
+++ b/src/dorkbox/peParser/DataLocation.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe;
+package dorkbox.peParser;
 
 public class DataLocation {
 
diff --git a/src/dorkbox/util/pe/PE.java b/src/dorkbox/peParser/PE.java
similarity index 92%
rename from src/dorkbox/util/pe/PE.java
rename to src/dorkbox/peParser/PE.java
index 7266178..3aa2c6c 100644
--- a/src/dorkbox/util/pe/PE.java
+++ b/src/dorkbox/peParser/PE.java
@@ -13,7 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe;
+package dorkbox.peParser;
+
+import dorkbox.peParser.headers.resources.ResourceDataEntry;
+import dorkbox.peParser.headers.resources.ResourceDirectoryEntry;
+import dorkbox.peParser.headers.resources.ResourceDirectoryHeader;
+import dorkbox.peParser.types.ByteDefinition;
+import dorkbox.peParser.types.ImageDataDir;
+import dorkbox.util.OS;
+import dorkbox.peParser.headers.COFFFileHeader;
+import dorkbox.peParser.headers.Header;
+import dorkbox.peParser.headers.OptionalHeader;
+import dorkbox.peParser.headers.SectionTable;
+import dorkbox.peParser.headers.SectionTableEntry;
+import dorkbox.peParser.misc.DirEntry;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -23,19 +36,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.LinkedList;
 
-import dorkbox.util.OS;
-import dorkbox.util.pe.headers.COFFFileHeader;
-import dorkbox.util.pe.headers.Header;
-import dorkbox.util.pe.headers.OptionalHeader;
-import dorkbox.util.pe.headers.SectionTable;
-import dorkbox.util.pe.headers.SectionTableEntry;
-import dorkbox.util.pe.headers.resources.ResourceDataEntry;
-import dorkbox.util.pe.headers.resources.ResourceDirectoryEntry;
-import dorkbox.util.pe.headers.resources.ResourceDirectoryHeader;
-import dorkbox.util.pe.misc.DirEntry;
-import dorkbox.util.pe.types.ByteDefinition;
-import dorkbox.util.pe.types.ImageDataDir;
-
 public class PE {
     // info from:
     // http://evilzone.org/tutorials/(paper)-portable-executable-format-and-its-rsrc-section/
@@ -43,6 +43,13 @@ public class PE {
     // http://www.csn.ul.ie/~caolan/pub/winresdump/winresdump/doc/pefile2.html
     // http://msdn.microsoft.com/en-us/library/ms809762.aspx
 
+    /**
+     * Gets the version number.
+     */
+    public static
+    String getVersion() {
+        return "2.0";
+    }
 
     private static final int PE_OFFSET_LOCATION = 0x3c;
     private static final byte[] PE_SIG = "PE\0\0".getBytes();
@@ -202,7 +209,6 @@ public class PE {
         }
     }
 
-    @SuppressWarnings("null")
     public ByteArrayInputStream getLargestResourceAsStream() {
         for (ImageDataDir entry : this.optionalHeader.tables) {
             if (entry.getType() == DirEntry.RESOURCE) {
@@ -243,3 +249,12 @@ public class PE {
         return null;
     }
 }
+
+
+
+
+
+
+
+
+
diff --git a/src/dorkbox/util/pe/headers/COFFFileHeader.java b/src/dorkbox/peParser/headers/COFFFileHeader.java
similarity index 90%
rename from src/dorkbox/util/pe/headers/COFFFileHeader.java
rename to src/dorkbox/peParser/headers/COFFFileHeader.java
index ebf9f32..54e7056 100644
--- a/src/dorkbox/util/pe/headers/COFFFileHeader.java
+++ b/src/dorkbox/peParser/headers/COFFFileHeader.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers;
+package dorkbox.peParser.headers;
 
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.types.DWORD;
-import dorkbox.util.pe.types.MachineType;
-import dorkbox.util.pe.types.CoffCharacteristics;
-import dorkbox.util.pe.types.TimeDate;
-import dorkbox.util.pe.types.WORD;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.types.CoffCharacteristics;
+import dorkbox.peParser.types.DWORD;
+import dorkbox.peParser.types.MachineType;
+import dorkbox.peParser.types.TimeDate;
+import dorkbox.peParser.types.WORD;
 
 public class COFFFileHeader extends Header {
 
diff --git a/src/dorkbox/util/pe/headers/Header.java b/src/dorkbox/peParser/headers/Header.java
similarity index 91%
rename from src/dorkbox/util/pe/headers/Header.java
rename to src/dorkbox/peParser/headers/Header.java
index b72ffde..8a6a59c 100644
--- a/src/dorkbox/util/pe/headers/Header.java
+++ b/src/dorkbox/peParser/headers/Header.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers;
+package dorkbox.peParser.headers;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import dorkbox.util.pe.types.ByteDefinition;
+import dorkbox.peParser.types.ByteDefinition;
 
 public class Header {
     public List<ByteDefinition<?>> headers = new ArrayList<ByteDefinition<?>>(0);
diff --git a/src/dorkbox/util/pe/headers/OptionalHeader.java b/src/dorkbox/peParser/headers/OptionalHeader.java
similarity index 92%
rename from src/dorkbox/util/pe/headers/OptionalHeader.java
rename to src/dorkbox/peParser/headers/OptionalHeader.java
index 13ba115..242625d 100644
--- a/src/dorkbox/util/pe/headers/OptionalHeader.java
+++ b/src/dorkbox/peParser/headers/OptionalHeader.java
@@ -13,27 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers;
+package dorkbox.peParser.headers;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.misc.DirEntry;
-import dorkbox.util.pe.misc.MagicNumberType;
-import dorkbox.util.pe.types.ByteDefinition;
-import dorkbox.util.pe.types.DWORD;
-import dorkbox.util.pe.types.HeaderDefinition;
-import dorkbox.util.pe.types.ImageBase;
-import dorkbox.util.pe.types.ImageBase_Wide;
-import dorkbox.util.pe.types.ImageDataDir;
-import dorkbox.util.pe.types.ImageDataDirExtra;
-import dorkbox.util.pe.types.MagicNumber;
-import dorkbox.util.pe.types.DWORD_WIDE;
-import dorkbox.util.pe.types.RVA;
-import dorkbox.util.pe.types.DllCharacteristics;
-import dorkbox.util.pe.types.Subsystem;
-import dorkbox.util.pe.types.WORD;
+import dorkbox.peParser.misc.DirEntry;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.misc.MagicNumberType;
+import dorkbox.peParser.types.ByteDefinition;
+import dorkbox.peParser.types.DWORD;
+import dorkbox.peParser.types.HeaderDefinition;
+import dorkbox.peParser.types.ImageBase;
+import dorkbox.peParser.types.ImageBase_Wide;
+import dorkbox.peParser.types.ImageDataDir;
+import dorkbox.peParser.types.ImageDataDirExtra;
+import dorkbox.peParser.types.MagicNumber;
+import dorkbox.peParser.types.DWORD_WIDE;
+import dorkbox.peParser.types.RVA;
+import dorkbox.peParser.types.DllCharacteristics;
+import dorkbox.peParser.types.Subsystem;
+import dorkbox.peParser.types.WORD;
 
 public class OptionalHeader extends Header {
 
diff --git a/src/dorkbox/util/pe/headers/SectionTable.java b/src/dorkbox/peParser/headers/SectionTable.java
similarity index 95%
rename from src/dorkbox/util/pe/headers/SectionTable.java
rename to src/dorkbox/peParser/headers/SectionTable.java
index c75bd8e..83c6efe 100644
--- a/src/dorkbox/util/pe/headers/SectionTable.java
+++ b/src/dorkbox/peParser/headers/SectionTable.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers;
+package dorkbox.peParser.headers;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import dorkbox.util.pe.ByteArray;
+import dorkbox.peParser.ByteArray;
 
 public class SectionTable extends Header {
 
diff --git a/src/dorkbox/util/pe/headers/SectionTableEntry.java b/src/dorkbox/peParser/headers/SectionTableEntry.java
similarity index 87%
rename from src/dorkbox/util/pe/headers/SectionTableEntry.java
rename to src/dorkbox/peParser/headers/SectionTableEntry.java
index 4d00dff..2bbeb06 100644
--- a/src/dorkbox/util/pe/headers/SectionTableEntry.java
+++ b/src/dorkbox/peParser/headers/SectionTableEntry.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers;
+package dorkbox.peParser.headers;
 
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.types.AsciiString;
-import dorkbox.util.pe.types.HeaderDefinition;
-import dorkbox.util.pe.types.DWORD;
-import dorkbox.util.pe.types.SectionCharacteristics;
-import dorkbox.util.pe.types.WORD;
+import dorkbox.peParser.types.AsciiString;
+import dorkbox.peParser.types.HeaderDefinition;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.types.DWORD;
+import dorkbox.peParser.types.SectionCharacteristics;
+import dorkbox.peParser.types.WORD;
 
 public class SectionTableEntry extends Header {
 
@@ -39,7 +39,6 @@ public class SectionTableEntry extends Header {
     public final WORD NUMBER_OF_LINE_NUMBERS;
     public final SectionCharacteristics CHARACTERISTICS;
 
-    @SuppressWarnings("unused")
     public SectionTableEntry(ByteArray bytes, int entryNumber, int offset, int size) {
 
         h(new HeaderDefinition("Section table entry: " + entryNumber));
diff --git a/src/dorkbox/util/pe/headers/flags/Characteristics.java b/src/dorkbox/peParser/headers/flags/Characteristics.java
similarity index 98%
rename from src/dorkbox/util/pe/headers/flags/Characteristics.java
rename to src/dorkbox/peParser/headers/flags/Characteristics.java
index 5b65c1f..92a79c1 100644
--- a/src/dorkbox/util/pe/headers/flags/Characteristics.java
+++ b/src/dorkbox/peParser/headers/flags/Characteristics.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers.flags;
+package dorkbox.peParser.headers.flags;
+
+import dorkbox.util.bytes.UShort;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import dorkbox.util.bytes.UShort;
-
 public enum Characteristics {
 
     IMAGE_FILE_RELOCS_STRIPPED("1", "Resource information is stripped from the file"),
diff --git a/src/dorkbox/util/pe/headers/flags/DllCharacteristicsType.java b/src/dorkbox/peParser/headers/flags/DllCharacteristicsType.java
similarity index 98%
rename from src/dorkbox/util/pe/headers/flags/DllCharacteristicsType.java
rename to src/dorkbox/peParser/headers/flags/DllCharacteristicsType.java
index 2ed6e51..f61d38a 100644
--- a/src/dorkbox/util/pe/headers/flags/DllCharacteristicsType.java
+++ b/src/dorkbox/peParser/headers/flags/DllCharacteristicsType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers.flags;
+package dorkbox.peParser.headers.flags;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/dorkbox/util/pe/headers/flags/SectionCharacteristicsType.java b/src/dorkbox/peParser/headers/flags/SectionCharacteristicsType.java
similarity index 99%
rename from src/dorkbox/util/pe/headers/flags/SectionCharacteristicsType.java
rename to src/dorkbox/peParser/headers/flags/SectionCharacteristicsType.java
index 6dcdff9..c821d58 100644
--- a/src/dorkbox/util/pe/headers/flags/SectionCharacteristicsType.java
+++ b/src/dorkbox/peParser/headers/flags/SectionCharacteristicsType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers.flags;
+package dorkbox.peParser.headers.flags;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/dorkbox/util/pe/headers/resources/ResourceDataEntry.java b/src/dorkbox/peParser/headers/resources/ResourceDataEntry.java
similarity index 91%
rename from src/dorkbox/util/pe/headers/resources/ResourceDataEntry.java
rename to src/dorkbox/peParser/headers/resources/ResourceDataEntry.java
index 430c8bf..61a9f37 100644
--- a/src/dorkbox/util/pe/headers/resources/ResourceDataEntry.java
+++ b/src/dorkbox/peParser/headers/resources/ResourceDataEntry.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers.resources;
+package dorkbox.peParser.headers.resources;
 
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.headers.Header;
-import dorkbox.util.pe.headers.SectionTableEntry;
-import dorkbox.util.pe.types.DWORD;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.headers.Header;
+import dorkbox.peParser.headers.SectionTableEntry;
+import dorkbox.peParser.types.DWORD;
 
 public class ResourceDataEntry extends Header {
 
diff --git a/src/dorkbox/util/pe/headers/resources/ResourceDirectoryEntry.java b/src/dorkbox/peParser/headers/resources/ResourceDirectoryEntry.java
similarity index 92%
rename from src/dorkbox/util/pe/headers/resources/ResourceDirectoryEntry.java
rename to src/dorkbox/peParser/headers/resources/ResourceDirectoryEntry.java
index 842585b..7e7b199 100644
--- a/src/dorkbox/util/pe/headers/resources/ResourceDirectoryEntry.java
+++ b/src/dorkbox/peParser/headers/resources/ResourceDirectoryEntry.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers.resources;
+package dorkbox.peParser.headers.resources;
 
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.headers.Header;
-import dorkbox.util.pe.headers.SectionTableEntry;
-import dorkbox.util.pe.types.DWORD;
-import dorkbox.util.pe.types.ResourceDirName;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.headers.Header;
+import dorkbox.peParser.headers.SectionTableEntry;
+import dorkbox.peParser.types.DWORD;
+import dorkbox.peParser.types.ResourceDirName;
 
 public class ResourceDirectoryEntry extends Header {
 
diff --git a/src/dorkbox/util/pe/headers/resources/ResourceDirectoryHeader.java b/src/dorkbox/peParser/headers/resources/ResourceDirectoryHeader.java
similarity index 88%
rename from src/dorkbox/util/pe/headers/resources/ResourceDirectoryHeader.java
rename to src/dorkbox/peParser/headers/resources/ResourceDirectoryHeader.java
index 39534e7..51f2939 100644
--- a/src/dorkbox/util/pe/headers/resources/ResourceDirectoryHeader.java
+++ b/src/dorkbox/peParser/headers/resources/ResourceDirectoryHeader.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.headers.resources;
+package dorkbox.peParser.headers.resources;
 
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.headers.Header;
-import dorkbox.util.pe.headers.SectionTableEntry;
-import dorkbox.util.pe.types.DWORD;
-import dorkbox.util.pe.types.TimeDate;
-import dorkbox.util.pe.types.WORD;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.headers.Header;
+import dorkbox.peParser.headers.SectionTableEntry;
+import dorkbox.peParser.types.DWORD;
+import dorkbox.peParser.types.TimeDate;
+import dorkbox.peParser.types.WORD;
 
 public class ResourceDirectoryHeader extends Header {
 
diff --git a/src/dorkbox/util/pe/misc/DirEntry.java b/src/dorkbox/peParser/misc/DirEntry.java
similarity index 97%
rename from src/dorkbox/util/pe/misc/DirEntry.java
rename to src/dorkbox/peParser/misc/DirEntry.java
index 2816e6f..ceeb358 100644
--- a/src/dorkbox/util/pe/misc/DirEntry.java
+++ b/src/dorkbox/peParser/misc/DirEntry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.misc;
+package dorkbox.peParser.misc;
 
 public enum DirEntry {
 
diff --git a/src/dorkbox/util/pe/misc/ImageBaseType.java b/src/dorkbox/peParser/misc/ImageBaseType.java
similarity index 97%
rename from src/dorkbox/util/pe/misc/ImageBaseType.java
rename to src/dorkbox/peParser/misc/ImageBaseType.java
index 1edc57a..132f600 100644
--- a/src/dorkbox/util/pe/misc/ImageBaseType.java
+++ b/src/dorkbox/peParser/misc/ImageBaseType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.misc;
+package dorkbox.peParser.misc;
 
 import dorkbox.util.bytes.UInteger;
 
diff --git a/src/dorkbox/util/pe/misc/MachineTypeType.java b/src/dorkbox/peParser/misc/MachineTypeType.java
similarity index 98%
rename from src/dorkbox/util/pe/misc/MachineTypeType.java
rename to src/dorkbox/peParser/misc/MachineTypeType.java
index 36e6c73..bf8a3aa 100644
--- a/src/dorkbox/util/pe/misc/MachineTypeType.java
+++ b/src/dorkbox/peParser/misc/MachineTypeType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.misc;
+package dorkbox.peParser.misc;
 
 import dorkbox.util.bytes.UShort;
 
diff --git a/src/dorkbox/util/pe/misc/MagicNumberType.java b/src/dorkbox/peParser/misc/MagicNumberType.java
similarity index 97%
rename from src/dorkbox/util/pe/misc/MagicNumberType.java
rename to src/dorkbox/peParser/misc/MagicNumberType.java
index bd87c6e..a221b92 100644
--- a/src/dorkbox/util/pe/misc/MagicNumberType.java
+++ b/src/dorkbox/peParser/misc/MagicNumberType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.misc;
+package dorkbox.peParser.misc;
 
 import dorkbox.util.bytes.UShort;
 
diff --git a/src/dorkbox/util/pe/misc/ResourceTypes.java b/src/dorkbox/peParser/misc/ResourceTypes.java
similarity index 98%
rename from src/dorkbox/util/pe/misc/ResourceTypes.java
rename to src/dorkbox/peParser/misc/ResourceTypes.java
index d9341bf..791792f 100644
--- a/src/dorkbox/util/pe/misc/ResourceTypes.java
+++ b/src/dorkbox/peParser/misc/ResourceTypes.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.misc;
+package dorkbox.peParser.misc;
 
 import dorkbox.util.bytes.UInteger;
 
diff --git a/src/dorkbox/util/pe/misc/SubsystemType.java b/src/dorkbox/peParser/misc/SubsystemType.java
similarity index 98%
rename from src/dorkbox/util/pe/misc/SubsystemType.java
rename to src/dorkbox/peParser/misc/SubsystemType.java
index 6062831..ccd22ef 100644
--- a/src/dorkbox/util/pe/misc/SubsystemType.java
+++ b/src/dorkbox/peParser/misc/SubsystemType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.misc;
+package dorkbox.peParser.misc;
 
 import dorkbox.util.bytes.UShort;
 
diff --git a/src/dorkbox/util/pe/types/AsciiString.java b/src/dorkbox/peParser/types/AsciiString.java
similarity index 94%
rename from src/dorkbox/util/pe/types/AsciiString.java
rename to src/dorkbox/peParser/types/AsciiString.java
index 9b705dd..ae785d3 100644
--- a/src/dorkbox/util/pe/types/AsciiString.java
+++ b/src/dorkbox/peParser/types/AsciiString.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
-import dorkbox.util.pe.ByteArray;
+import dorkbox.peParser.ByteArray;
 
 public class AsciiString extends ByteDefinition<String> {
 
diff --git a/src/dorkbox/util/pe/types/ByteDefinition.java b/src/dorkbox/peParser/types/ByteDefinition.java
similarity index 97%
rename from src/dorkbox/util/pe/types/ByteDefinition.java
rename to src/dorkbox/peParser/types/ByteDefinition.java
index 0b369a0..43139cf 100644
--- a/src/dorkbox/util/pe/types/ByteDefinition.java
+++ b/src/dorkbox/peParser/types/ByteDefinition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 public abstract class ByteDefinition<T> {
 
diff --git a/src/dorkbox/util/pe/types/CoffCharacteristics.java b/src/dorkbox/peParser/types/CoffCharacteristics.java
similarity index 94%
rename from src/dorkbox/util/pe/types/CoffCharacteristics.java
rename to src/dorkbox/peParser/types/CoffCharacteristics.java
index d691022..4619a80 100644
--- a/src/dorkbox/util/pe/types/CoffCharacteristics.java
+++ b/src/dorkbox/peParser/types/CoffCharacteristics.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UShort;
-import dorkbox.util.pe.headers.flags.Characteristics;
+import dorkbox.peParser.headers.flags.Characteristics;
 
 public class CoffCharacteristics extends ByteDefinition<Characteristics[]> {
 
diff --git a/src/dorkbox/util/pe/types/DWORD.java b/src/dorkbox/peParser/types/DWORD.java
similarity index 97%
rename from src/dorkbox/util/pe/types/DWORD.java
rename to src/dorkbox/peParser/types/DWORD.java
index 9453b91..50de197 100644
--- a/src/dorkbox/util/pe/types/DWORD.java
+++ b/src/dorkbox/peParser/types/DWORD.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
diff --git a/src/dorkbox/util/pe/types/DWORD_WIDE.java b/src/dorkbox/peParser/types/DWORD_WIDE.java
similarity index 97%
rename from src/dorkbox/util/pe/types/DWORD_WIDE.java
rename to src/dorkbox/peParser/types/DWORD_WIDE.java
index 64b2be5..a231908 100644
--- a/src/dorkbox/util/pe/types/DWORD_WIDE.java
+++ b/src/dorkbox/peParser/types/DWORD_WIDE.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.ULong;
diff --git a/src/dorkbox/util/pe/types/DllCharacteristics.java b/src/dorkbox/peParser/types/DllCharacteristics.java
similarity index 94%
rename from src/dorkbox/util/pe/types/DllCharacteristics.java
rename to src/dorkbox/peParser/types/DllCharacteristics.java
index 5e268a1..ca5575e 100644
--- a/src/dorkbox/util/pe/types/DllCharacteristics.java
+++ b/src/dorkbox/peParser/types/DllCharacteristics.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
+import dorkbox.peParser.headers.flags.DllCharacteristicsType;
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UShort;
-import dorkbox.util.pe.headers.flags.DllCharacteristicsType;
 
 public class DllCharacteristics extends ByteDefinition<DllCharacteristicsType[]> {
 
diff --git a/src/dorkbox/util/pe/types/HeaderDefinition.java b/src/dorkbox/peParser/types/HeaderDefinition.java
similarity index 97%
rename from src/dorkbox/util/pe/types/HeaderDefinition.java
rename to src/dorkbox/peParser/types/HeaderDefinition.java
index d00e777..e88e8c8 100644
--- a/src/dorkbox/util/pe/types/HeaderDefinition.java
+++ b/src/dorkbox/peParser/types/HeaderDefinition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 
diff --git a/src/dorkbox/util/pe/types/ImageBase.java b/src/dorkbox/peParser/types/ImageBase.java
similarity index 95%
rename from src/dorkbox/util/pe/types/ImageBase.java
rename to src/dorkbox/peParser/types/ImageBase.java
index d86ad29..a98b0e1 100644
--- a/src/dorkbox/util/pe/types/ImageBase.java
+++ b/src/dorkbox/peParser/types/ImageBase.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
-import dorkbox.util.pe.misc.ImageBaseType;
+import dorkbox.peParser.misc.ImageBaseType;
 
 public class ImageBase extends ByteDefinition<UInteger> {
 
diff --git a/src/dorkbox/util/pe/types/ImageBase_Wide.java b/src/dorkbox/peParser/types/ImageBase_Wide.java
similarity index 95%
rename from src/dorkbox/util/pe/types/ImageBase_Wide.java
rename to src/dorkbox/peParser/types/ImageBase_Wide.java
index 53af956..58d9e20 100644
--- a/src/dorkbox/util/pe/types/ImageBase_Wide.java
+++ b/src/dorkbox/peParser/types/ImageBase_Wide.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
 import dorkbox.util.bytes.ULong;
-import dorkbox.util.pe.misc.ImageBaseType;
+import dorkbox.peParser.misc.ImageBaseType;
 
 public class ImageBase_Wide extends ByteDefinition<ULong> {
 
diff --git a/src/dorkbox/util/pe/types/ImageDataDir.java b/src/dorkbox/peParser/types/ImageDataDir.java
similarity index 91%
rename from src/dorkbox/util/pe/types/ImageDataDir.java
rename to src/dorkbox/peParser/types/ImageDataDir.java
index 8acb5a8..281fa47 100644
--- a/src/dorkbox/util/pe/types/ImageDataDir.java
+++ b/src/dorkbox/peParser/types/ImageDataDir.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.headers.Header;
-import dorkbox.util.pe.headers.SectionTableEntry;
-import dorkbox.util.pe.misc.DirEntry;
+import dorkbox.peParser.ByteArray;
+import dorkbox.peParser.headers.Header;
+import dorkbox.peParser.headers.SectionTableEntry;
+import dorkbox.peParser.misc.DirEntry;
 
 public class ImageDataDir extends ByteDefinition<UInteger> {
 
diff --git a/src/dorkbox/util/pe/types/ImageDataDirExtra.java b/src/dorkbox/peParser/types/ImageDataDirExtra.java
similarity index 96%
rename from src/dorkbox/util/pe/types/ImageDataDirExtra.java
rename to src/dorkbox/peParser/types/ImageDataDirExtra.java
index 824de59..359d49a 100644
--- a/src/dorkbox/util/pe/types/ImageDataDirExtra.java
+++ b/src/dorkbox/peParser/types/ImageDataDirExtra.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
-import dorkbox.util.pe.ByteArray;
+import dorkbox.peParser.ByteArray;
 
 public class ImageDataDirExtra extends ByteDefinition<UInteger> {
 
diff --git a/src/dorkbox/util/pe/types/MachineType.java b/src/dorkbox/peParser/types/MachineType.java
similarity index 93%
rename from src/dorkbox/util/pe/types/MachineType.java
rename to src/dorkbox/peParser/types/MachineType.java
index 340b3d5..c7fc136 100644
--- a/src/dorkbox/util/pe/types/MachineType.java
+++ b/src/dorkbox/peParser/types/MachineType.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
+import dorkbox.peParser.misc.MachineTypeType;
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UShort;
-import dorkbox.util.pe.misc.MachineTypeType;
 
 public class MachineType extends ByteDefinition<MachineTypeType> {
 
diff --git a/src/dorkbox/util/pe/types/MagicNumber.java b/src/dorkbox/peParser/types/MagicNumber.java
similarity index 94%
rename from src/dorkbox/util/pe/types/MagicNumber.java
rename to src/dorkbox/peParser/types/MagicNumber.java
index c5323b8..bb0f15d 100644
--- a/src/dorkbox/util/pe/types/MagicNumber.java
+++ b/src/dorkbox/peParser/types/MagicNumber.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UShort;
-import dorkbox.util.pe.misc.MagicNumberType;
+import dorkbox.peParser.misc.MagicNumberType;
 
 public class MagicNumber extends ByteDefinition<MagicNumberType> {
 
diff --git a/src/dorkbox/util/pe/types/RVA.java b/src/dorkbox/peParser/types/RVA.java
similarity index 97%
rename from src/dorkbox/util/pe/types/RVA.java
rename to src/dorkbox/peParser/types/RVA.java
index 3b1d5b0..b0f9423 100644
--- a/src/dorkbox/util/pe/types/RVA.java
+++ b/src/dorkbox/peParser/types/RVA.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
diff --git a/src/dorkbox/util/pe/types/ResourceDirName.java b/src/dorkbox/peParser/types/ResourceDirName.java
similarity index 97%
rename from src/dorkbox/util/pe/types/ResourceDirName.java
rename to src/dorkbox/peParser/types/ResourceDirName.java
index 3315650..92ae8f0 100644
--- a/src/dorkbox/util/pe/types/ResourceDirName.java
+++ b/src/dorkbox/peParser/types/ResourceDirName.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
+import dorkbox.peParser.misc.ResourceTypes;
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
-import dorkbox.util.pe.ByteArray;
-import dorkbox.util.pe.misc.ResourceTypes;
+import dorkbox.peParser.ByteArray;
 
 public class ResourceDirName extends ByteDefinition<String> {
 
diff --git a/src/dorkbox/util/pe/types/SectionCharacteristics.java b/src/dorkbox/peParser/types/SectionCharacteristics.java
similarity index 94%
rename from src/dorkbox/util/pe/types/SectionCharacteristics.java
rename to src/dorkbox/peParser/types/SectionCharacteristics.java
index c33f7e3..d160304 100644
--- a/src/dorkbox/util/pe/types/SectionCharacteristics.java
+++ b/src/dorkbox/peParser/types/SectionCharacteristics.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
+import dorkbox.peParser.headers.flags.SectionCharacteristicsType;
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
-import dorkbox.util.pe.headers.flags.SectionCharacteristicsType;
 
 public class SectionCharacteristics extends ByteDefinition<SectionCharacteristicsType[]> {
 
diff --git a/src/dorkbox/util/pe/types/Subsystem.java b/src/dorkbox/peParser/types/Subsystem.java
similarity index 94%
rename from src/dorkbox/util/pe/types/Subsystem.java
rename to src/dorkbox/peParser/types/Subsystem.java
index b793dc6..8c8e2f5 100644
--- a/src/dorkbox/util/pe/types/Subsystem.java
+++ b/src/dorkbox/peParser/types/Subsystem.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
+import dorkbox.peParser.misc.SubsystemType;
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UShort;
-import dorkbox.util.pe.misc.SubsystemType;
 
 public class Subsystem extends ByteDefinition<SubsystemType> {
 
diff --git a/src/dorkbox/util/pe/types/TInteger.java b/src/dorkbox/peParser/types/TInteger.java
similarity index 97%
rename from src/dorkbox/util/pe/types/TInteger.java
rename to src/dorkbox/peParser/types/TInteger.java
index eaab78b..ffdba78 100644
--- a/src/dorkbox/util/pe/types/TInteger.java
+++ b/src/dorkbox/peParser/types/TInteger.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UInteger;
diff --git a/src/dorkbox/util/pe/types/TimeDate.java b/src/dorkbox/peParser/types/TimeDate.java
similarity index 97%
rename from src/dorkbox/util/pe/types/TimeDate.java
rename to src/dorkbox/peParser/types/TimeDate.java
index 532d01b..0079e53 100644
--- a/src/dorkbox/util/pe/types/TimeDate.java
+++ b/src/dorkbox/peParser/types/TimeDate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import java.util.Date;
 
diff --git a/src/dorkbox/util/pe/types/WORD.java b/src/dorkbox/peParser/types/WORD.java
similarity index 97%
rename from src/dorkbox/util/pe/types/WORD.java
rename to src/dorkbox/peParser/types/WORD.java
index 71022dd..d2d4620 100644
--- a/src/dorkbox/util/pe/types/WORD.java
+++ b/src/dorkbox/peParser/types/WORD.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.util.pe.types;
+package dorkbox.peParser.types;
 
 import dorkbox.util.OS;
 import dorkbox.util.bytes.UShort;