diff --git a/.gitignore b/.gitignore
index b2ae051..ad58a3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 Output/*
 OTP/*
 otp/*
-
+output/*
diff --git a/OTPKeySplitter.py b/OTPKeySplitter.py
index 847a4f3..4a12dc8 100644
--- a/OTPKeySplitter.py
+++ b/OTPKeySplitter.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python2
-import os, sys, zlib, binascii
+import os, sys, zlib
+import os.path
 import codecs
 from Crypto.Cipher import AES
+import csv
 
 
 optbin = os.path.abspath("OTP/otp.bin")
@@ -9,472 +11,55 @@
 #Thank you Audiosurf for the initial folder creation help.
 #Mine was way too messy originally!
 
-x = "Output/"
-k = " - Wii U Bank"
-outputfol = [x, x+"00 - Wii Bank" , x+"01"+k, x+"02"+k, x+"03"+k, x+"04 - Wii U NG Bank", x+"05 - Wii U Certificate Bank" , x+"06 - Wii Certificate Bank", x+"07 - Misc Bank"]
-for f in outputfol:
-	if not os.path.exists(f):
-		os.makedirs(f)
+categories = {
+  0: '00wii_bank',
+  1: '01wiiu_bank',
+  2: '02wiiu_bank',
+  3: '03wiiu_bank',
+  4: '04wiiu_ng_bank',
+  5: '05wiiu_cert_bank',
+  6: '06wii_cert_bank',
+  7: '07misc_bank'
+}
+
+descriptors = []
+class OTPDescriptor(object):
+  def __init__(self, name, offset, length, category):
+    self.name = name
+    self.offset = offset
+    self.length = length
+    self.category = category
+
+
+with open('names.csv', 'r') as fin:
+  reader = csv.reader(fin)
+  for row in reader:
+    name, offset, length, category = row
+    offset = int(offset, 16)
+    length = int(length)
+    category = int(category)
+    descriptors.append(OTPDescriptor(name, offset, length, category))
+
+data = {}
+with open(sys.argv[1], 'rb') as fin:
+  for descriptor in descriptors:
+    if descriptor.category < 0:
+      continue
+    print "Reading %s @ %d, length %d" % (descriptor.name, descriptor.offset, descriptor.length)
+    fin.seek(descriptor.offset)
+    x = fin.read(descriptor.length)
+    data[descriptor.name] = x
+
+
+for key,value in categories.iteritems():
+  p = os.path.join('output', value)
+  os.makedirs(p)
+
+for descriptor in descriptors:
+  if descriptor.category < 0:
+    continue
+  output_file = os.path.join('output',categories[descriptor.category], descriptor.name + '.bin')
+  print "Writing %s" % (descriptor.name)
+  with open(output_file, 'wb') as fout:
+    fout.write(data[descriptor.name])
 
-#Other Variables that will be used later down the line:
-out0 = x+"00 - Wii Bank"+"/"
-out1 = x+"01"+k+"/"
-out2 = x+"02"+k+"/"
-out3 = x+"03"+k+"/"
-out4 = x+"04 - Wii U NG Bank/"
-out5 = x+"05 - Wii U Certificate Bank/"
-out6 = x+"06 - Wii Certificate Bank/"
-out7 = x+"07 - Misc Bank/"
-
-#End other variables
-
-#prepare keys
-#Thanks FIX94 for this code snippet from the iosuhax
-#fw.img grabber in his IOSUHax fork.
-#For the source of this code, see:
-#https://github.com/FIX94/iosuhax/blob/master/bin/getfwimg.py
-
-if os.path.exists(optbin):
-    with open(optbin,'rb') as f:
-        print("Key extraction time!")
-
-        # First, vWii.
-
-        f.seek(0x000)
-        wii_boot1_sha1 = binascii.hexlify(f.read(20))
-        f.seek(0x014)
-        wii_common_key = binascii.hexlify(f.read(16))
-        f.seek(0x024)
-        wii_ng_id = binascii.hexlify(f.read(4))
-        f.seek(0x028)
-        wii_ng_priv_key = binascii.hexlify(f.read(29))
-        f.seek(0x044)
-        wii_nand_hmac = binascii.hexlify(f.read(20))
-        f.seek(0x058)
-        wii_nand_key = binascii.hexlify(f.read(16))
-        f.seek(0x068)
-        wii_rng_key = binascii.hexlify(f.read(16))
-        f.seek(0x078)
-        wii_unknown01_padding = binascii.hexlify(f.read(8))
-        f.seek(0x300)
-        wii_root_cert_ms_id_0x00000002 = binascii.hexlify(f.read(4))
-        f.seek(0x304)
-        wii_root_cert_ca_id_0x00000001 = binascii.hexlify(f.read(4))
-        f.seek(0x308)
-        wii_root_cert_ng_key_id = binascii.hexlify(f.read(4))
-        f.seek(0x30C)
-        wii_root_cert_ng_signature = binascii.hexlify(f.read(60))
-        f.seek(0x348)
-        wii_korean_key = binascii.hexlify(f.read(16))
-        f.seek(0x358)
-        wii_unknown02_unused = binascii.hexlify(f.read(8))
-        f.seek(0x360)
-        wii_private_nss_device_cert_key = binascii.hexlify(f.read(32))
-        
-        # The Wii U is next
-        
-        f.seek(0x080)
-        security_level_flag = binascii.hexlify(f.read(4))
-        f.seek(0x084)
-        iostrength_config_flag = binascii.hexlify(f.read(4))
-        f.seek(0x088)
-        seeprom_manual_clk_pulse_length = binascii.hexlify(f.read(4))
-        f.seek(0x08C)
-        unknown_00010000 = binascii.hexlify(f.read(4))
-        f.seek(0x090)
-        wiiu_starbuck_ancast_key = binascii.hexlify(f.read(16))
-        f.seek(0x0A0)
-        wiiu_seeprom_key = binascii.hexlify(f.read(16))
-        f.seek(0x0B0)
-        unknown_01_unused = binascii.hexlify(f.read(16))
-        f.seek(0x0C0)
-        unknown_02_unused = binascii.hexlify(f.read(16))
-        f.seek(0x0D0)
-        vwii_common_key = binascii.hexlify(f.read(16))
-        f.seek(0x0E0)
-        wiiu_common_key = binascii.hexlify(f.read(16))
-        f.seek(0x0F0)
-        unknown_03_unused = binascii.hexlify(f.read(16))
-        f.seek(0x100)
-        unknown_04_unused = binascii.hexlify(f.read(16))
-        f.seek(0x110)
-        unknown_05_unused = binascii.hexlify(f.read(16))
-        f.seek(0x120)        
-        encrypt_decrypt_ssl_rsa_key = binascii.hexlify(f.read(16))
-        f.seek(0x130)
-        usb_storage_key_seed_encryption_key = binascii.hexlify(f.read(16))
-        f.seek(0x140)
-        unknown_06 = binascii.hexlify(f.read(16))        
-        f.seek(0x150)
-        wiiu_xor_key = binascii.hexlify(f.read(16))
-        f.seek(0x160)
-        wiiu_rng_key = binascii.hexlify(f.read(16))
-        f.seek(0x170)
-        wiiu_slc_nand_key = binascii.hexlify(f.read(16))
-        f.seek(0x180)
-        wiiu_mlc_emmc_key = binascii.hexlify(f.read(16))
-        f.seek(0x190)
-        encrypt_decrypt_shdd_key = binascii.hexlify(f.read(16))
-        f.seek(0x1A0)
-        encryption_key_for_drh_wlan_data = binascii.hexlify(f.read(16))
-        f.seek(0x1B0)
-        unknown_07_unused = binascii.hexlify(f.read(48))
-        f.seek(0x1E0)
-        wiiu_slc_nand_hmac = binascii.hexlify(f.read(20))
-        f.seek(0x1F4)
-        unknown_08_padding = binascii.hexlify(f.read(12))
-        f.seek(0x200)
-        unknown_09_unused = binascii.hexlify(f.read(16))
-        f.seek(0x210)
-        unknown_10_unused = binascii.hexlify(f.read(12))
-        f.seek(0x21C)
-        wiiu_ng_id = binascii.hexlify(f.read(4))
-        f.seek(0x220)
-        wiiu_ng_private_key = binascii.hexlify(f.read(32))
-        f.seek(0x240)
-        wiiu_private_nss_device_cert_key = binascii.hexlify(f.read(32))        
-        f.seek(0x260)
-        wiiu_otp_rng_seed = binascii.hexlify(f.read(16))
-        f.seek(0x270)
-        unknown_12_unused = binascii.hexlify(f.read(16))
-        f.seek(0x280)
-        wiiu_root_cert_ms_id_0x00000012 = binascii.hexlify(f.read(4))
-        f.seek(0x284)
-        wiiu_root_cert_ca_id_0x00000003 = binascii.hexlify(f.read(4))
-        f.seek(0x288)
-        wiiu_root_cert_ng_key_id = binascii.hexlify(f.read(4))
-        f.seek(0x28C)
-        wiiu_root_cert_ng_signature = binascii.hexlify(f.read(64))
-        f.seek(0x2C8)
-        unknown_14_unused = binascii.hexlify(f.read(20))
-        f.seek(0x2E0)
-        unknown_15_locked_by_boot1 = binascii.hexlify(f.read(32))
-        
-        # MISC
-
-        f.seek(0x380)
-        boot1_locked_unknown_01 = binascii.hexlify(f.read(32))
-        f.seek(0x3A0)
-        boot1_key_locked_by_b0 = binascii.hexlify(f.read(16))
-        f.seek(0x3B0)
-        boot0_locked_unused_01 = binascii.hexlify(f.read(16))
-        f.seek(0x3C0)
-        misc_empty1 = binascii.hexlify(f.read(32))
-        f.seek(0x3E0)
-        misc_empty2 = binascii.hexlify(f.read(4))
-        f.seek(0x3E4)
-        otp_version_and_revision = binascii.hexlify(f.read(4))
-        f.seek(0x3E8)
-        otp_date_code = binascii.hexlify(f.read(8)) 
-        f.seek(0x3F0)
-        otp_version_name_string = binascii.hexlify(f.read(8))
-        f.seek(0x3F8)
-        misc_empty3 = binascii.hexlify(f.read(4))
-        f.seek(0x3FC)
-        jtag_status = binascii.hexlify(f.read(4))
-
-else:
-    if not os.path.exists("OTP"):
-        os.makedirs("OTP")
-    print("Put the otp.bin into the OTP folder please!")
-    sys.exit(1)
-
-#Output to files. This will be messy.
-#Probably way messier than above.
-#vWii
-
- # 0. Wii Bank
-
-target=out0+"01. Wii boot1 SHA-1 hash.bin"
-fi = open(target, "wb")
-fi.write(wii_boot1_sha1.decode("hex"))
-fi.close()
-
-target=out0+"02. Wii common key.bin"
-fi = open(target, "wb")
-fi.write(wii_common_key.decode("hex"))
-fi.close()
-
-target=out0+"03. Wii NG ID.bin"
-fi = open(target, "wb")
-fi.write(wii_ng_id.decode("hex"))
-fi.close()
-
-target=out0+"04. Wii NG private key.bin"
-fi = open(target, "wb")
-fi.write(wii_ng_priv_key.decode("hex"))
-fi.close()
-
-target=out0+"05. Wii NAND HMAC (overlaps with NG private key).bin"
-fi = open(target, "wb")
-fi.write(wii_nand_hmac.decode("hex"))
-fi.close()
-
-target=out0+"06. Wii NAND key.bin"
-fi = open(target, "wb")
-fi.write(wii_nand_key.decode("hex"))
-fi.close()
-
-target=out0+"07. Wii RNG key.bin"
-fi = open(target, "wb")
-fi.write(wii_rng_key.decode("hex"))
-fi.close()
-
-target=out0+"08. Unknown (Padding).bin"
-fi = open(target, "wb")
-fi.write(wii_unknown01_padding.decode("hex"))
-fi.close()
-
-
-# Wii U
-
- # 1. Wii U Bank
-
-target=out1+"01. Security level flag.bin"
-fi = open(target, "wb")
-fi.write(security_level_flag.decode("hex"))
-fi.close()
-
-target=out1+"02. Some flag for IOStrength configurations.bin"
-fi = open(target, "wb")
-fi.write(iostrength_config_flag.decode("hex"))
-fi.close()
-
-target=out1+"03. Pulse length for SEEPROM manual CLK.bin"
-fi = open(target, "wb")
-fi.write(seeprom_manual_clk_pulse_length.decode("hex"))
-fi.close()
-
-target=out1+"04. Unknown (0x00010000).bin"
-fi = open(target, "wb")
-fi.write(unknown_00010000.decode("hex"))
-fi.close()
-
-target=out1+"05. Wii U Starbuck ancast key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_starbuck_ancast_key.decode("hex"))
-fi.close()
-
-target=out1+"06. Wii U SEEPROM key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_seeprom_key.decode("hex"))
-fi.close()
-
-target=out1+"07. Unknown (01).bin"
-fi = open(target, "wb")
-fi.write(unknown_01_unused.decode("hex"))
-fi.close()
-
-target=out1+"08. Unknown (02).bin"
-fi = open(target, "wb")
-fi.write(unknown_02_unused.decode("hex"))
-fi.close()
-
-target=out1+"09. vWii common key.bin"
-fi = open(target, "wb")
-fi.write(vwii_common_key.decode("hex"))
-fi.close()
-
-target=out1+"10. Wii U Common Key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_common_key.decode("hex"))
-fi.close()
-
-target=out1+"11. Unknown (03).bin"
-fi = open(target, "wb")
-fi.write(unknown_03_unused.decode("hex"))
-fi.close()
-
- # 2. Wii U Bank
-
-target=out2+"01. Unknown (04).bin"
-fi = open(target, "wb")
-fi.write(unknown_04_unused.decode("hex"))
-fi.close()
-
-target=out2+"02. Unknown (05).bin"
-fi = open(target, "wb")
-fi.write(unknown_05_unused.decode("hex"))
-fi.close()
-
-target=out2+"03. Key to encrypt or decrypt SSL RSA key.bin"
-fi = open(target, "wb")
-fi.write(encrypt_decrypt_ssl_rsa_key.decode("hex"))
-fi.close()
-
-target=out2+"04. Key to encrypt seeds for USB storage keys.bin"
-fi = open(target, "wb")
-fi.write(usb_storage_key_seed_encryption_key.decode("hex"))
-fi.close()
-
-target=out2+"05. Unknown (06).bin"
-fi = open(target, "wb")
-fi.write(unknown_06.decode("hex"))
-fi.close()
-
-target=out2+"06. Wii U XOR key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_xor_key.decode("hex"))
-fi.close()
-
-target=out2+"07. Wii U RNG key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_rng_key.decode("hex"))
-fi.close()
-
-target=out2+"08. Wii U SLC (NAND) key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_slc_nand_key.decode("hex"))
-fi.close()
-
- # 3. Wii U Bank
-
-target=out3+"01. Wii U MLC (eMMC) key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_mlc_emmc_key.decode("hex"))
-fi.close()
-
-target=out3+"02.  Key to encrypt and decrypt SHDD key.bin"
-fi = open(target, "wb")
-fi.write(encrypt_decrypt_shdd_key.decode("hex"))
-fi.close()
-
-target=out3+"03. Key to encrypt DRH WLAN data.bin"
-fi = open(target, "wb")
-fi.write(encryption_key_for_drh_wlan_data.decode("hex"))
-fi.close()
-
-target=out3+"04. Unknown (07).bin"
-fi = open(target, "wb")
-fi.write(unknown_07_unused.decode("hex"))
-fi.close()
-
-target=out3+"05. Wii U SLC (NAND) HMAC.bin"
-fi = open(target, "wb")
-fi.write(wiiu_slc_nand_hmac.decode("hex"))
-fi.close()
-
-target=out3+"06. Unknown (08 - Padding).bin"
-fi = open(target, "wb")
-fi.write(unknown_08_padding.decode("hex"))
-fi.close()
-
- # 4. Wii U Bank
-target=out4+"01. Unknown (09).bin"
-fi = open(target, "wb")
-fi.write(unknown_09_unused.decode("hex"))
-fi.close()
-
-target=out4+"02. Unknown (10).bin"
-fi = open(target, "wb")
-fi.write(unknown_10_unused.decode("hex"))
-fi.close()
-
-target=out4+"03. Wii U NG ID.bin"
-fi = open(target, "wb")
-fi.write(wiiu_ng_id.decode("hex"))
-fi.close()
-
-target=out4+"04. Wii U NG Private Key.bin"
-fi = open(target, "wb")
-fi.write(wiiu_ng_private_key.decode("hex"))
-fi.close()
-
-target=out4+"05. Wii U private key for NSS device certificate.bin"
-fi = open(target, "wb")
-fi.write(wiiu_private_nss_device_cert_key.decode("hex"))
-fi.close()
-
-target=out4+"06. Wii U RNG seed (only the first 0x04 bytes are used).bin"
-fi = open(target, "wb")
-fi.write(wiiu_otp_rng_seed.decode("hex"))
-fi.close()
-
-target=out4+"07. Unknown (12).bin"
-fi = open(target, "wb")
-fi.write(unknown_12_unused.decode("hex"))
-fi.close()
-
- # 5. Wii U Bank
-target=out5+"01. Wii U root certificate MS ID.bin"
-fi = open(target, "wb")
-fi.write(wiiu_root_cert_ms_id_0x00000012
-.decode("hex"))
-fi.close()
-
-target=out5+"02. Wii U root certificate CA ID.bin"
-fi = open(target, "wb")
-fi.close()
-
-target=out5+"03.  Wii U root certificate NG key ID.bin"
-fi = open(target, "wb")
-fi.write(wiiu_root_cert_ng_key_id.decode("hex"))
-fi.close()
-
-target=out5+"04. Wii U root certificate NG signature.bin"
-fi = open(target, "wb")
-fi.write(wiiu_root_cert_ng_signature.decode("hex"))
-fi.close()
-
-target=out5+"04. Unknown (14 - Unused).bin"
-fi = open(target, "wb")
-fi.write(unknown_14_unused.decode("hex"))
-fi.close()
-
-target=out5+"05. Unknown (locked out by boot1).bin"
-fi = open(target, "wb")
-fi.write(unknown_15_locked_by_boot1.decode("hex"))
-fi.close()
-
-# 7. Misc Bank
-
-target=out7+"01. Unknown (locked by boot1).bin"
-fi = open(target, "wb")
-fi.write(boot1_locked_unknown_01.decode("hex"))
-fi.close()
-
-target=out7+"02. boot1 key (locked by boot0).bin"
-fi = open(target, "wb")
-fi.write(boot1_key_locked_by_b0.decode("hex"))
-fi.close()
-
-target=out7+"03. Unknown (locked out by boot0, not used).bin"
-fi = open(target, "wb")
-fi.write(boot0_locked_unused_01.decode("hex"))
-fi.close()
-
-target=out7+"04. Empty 1.bin"
-fi = open(target, "wb")
-fi.write(misc_empty1.decode("hex"))
-fi.close()
-
-target=out7+"05. Empty 2.bin"
-fi = open(target, "wb")
-fi.write(misc_empty2.decode("hex"))
-fi.close()
-
-target=out7+"06. Empty.bin"
-fi = open(target, "wb")
-fi.write(misc_empty3.decode("hex"))
-fi.close()
-
-target=out7+"0X. OTP Version and Revision.bin"
-fi = open(target, "wb")
-fi.write(otp_date_code.decode("hex"))
-fi.close()
-
-target=out7+"0X. OTP Date Code.bin"
-fi = open(target, "wb")
-fi.write(otp_version_and_revision.decode("hex"))
-fi.close()
-
-target=out7+"0X. OTP Version Name String.bin"
-fi = open(target, "wb")
-fi.write(otp_version_name_string.decode("hex"))
-fi.close()
-
-target=out7+"07. JTAG status.bin"
-fi = open(target, "wb")
-fi.write(jtag_status.decode("hex"))
-fi.close()
-#End file output
\ No newline at end of file
diff --git a/names.csv b/names.csv
new file mode 100644
index 0000000..ac40f74
--- /dev/null
+++ b/names.csv
@@ -0,0 +1,63 @@
+boot0_locked_unused_01,0x3b0,16,7
+boot1_key_locked_by_b0,0x3a0,16,7
+boot1_locked_unknown_01,0x380,32,7
+encrypt_decrypt_shdd_key,0x190,16,3
+encrypt_decrypt_ssl_rsa_key,0x120,16,2
+encryption_key_for_drh_wlan_data,0x1a0,16,3
+iostrength_config_flag,0x84,4,1
+jtag_status,0x3fc,4,7
+misc_empty1,0x3c0,32,7
+misc_empty2,0x3e0,4,7
+misc_empty3,0x3f8,4,7
+otp_date_code,0x3e8,8,7
+otp_version_and_revision,0x3e4,4,7
+otp_version_name_string,0x3f0,8,7
+security_level_flag,0x80,4,1
+seeprom_manual_clk_pulse_length,0x88,4,1
+unknown_00010000,0x8c,4,1
+unknown_01_unused,0xb0,16,1
+unknown_02_unused,0xc0,16,1
+unknown_03_unused,0xf0,16,1
+unknown_04_unused,0x100,16,2
+unknown_05_unused,0x110,16,2
+unknown_06,0x140,16,2
+unknown_07_unused,0x1b0,48,3
+unknown_08_padding,0x1f4,12,3
+unknown_09_unused,0x200,16,4
+unknown_10_unused,0x210,12,4
+unknown_12_unused,0x270,16,4
+unknown_14_unused,0x2c8,20,5
+unknown_15_locked_by_boot1,0x2e0,32,5
+usb_storage_key_seed_encryption_key,0x130,16,2
+vwii_common_key,0xd0,16,1
+wii_boot1_sha1,0x0,20,0
+wii_common_key,0x14,16,0
+wii_korean_key,0x348,16,-1
+wii_nand_hmac,0x44,20,0
+wii_nand_key,0x58,16,0
+wii_ng_id,0x24,4,0
+wii_ng_priv_key,0x28,29,0
+wii_private_nss_device_cert_key,0x360,32,0
+wii_rng_key,0x68,16,-1
+wii_root_cert_ca_id_0x00000001,0x304,4,-1
+wii_root_cert_ms_id_0x00000002,0x300,4,-1
+wii_root_cert_ng_key_id,0x308,4,-1
+wii_root_cert_ng_signature,0x30c,60,-1
+wii_unknown01_padding,0x78,8,-1
+wii_unknown02_unused,0x358,8,-1
+wiiu_common_key,0xe0,16,1
+wiiu_mlc_emmc_key,0x180,16,3
+wiiu_ng_id,0x21c,4,4
+wiiu_ng_private_key,0x220,32,4
+wiiu_otp_rng_seed,0x260,16,4
+wiiu_private_nss_device_cert_key,0x240,32,4
+wiiu_rng_key,0x160,16,2
+wiiu_root_cert_ca_id_0x00000003,0x284,4,5
+wiiu_root_cert_ms_id_0x00000012,0x280,4,5
+wiiu_root_cert_ng_key_id,0x288,4,5
+wiiu_root_cert_ng_signature,0x28c,64,5
+wiiu_seeprom_key,0xa0,16,1
+wiiu_slc_nand_hmac,0x1e0,20,3
+wiiu_slc_nand_key,0x170,16,2
+wiiu_starbuck_ancast_key,0x90,16,1
+wiiu_xor_key,0x150,16,2