210 files changed, 741 insertions, 812 deletions

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 46e1d20..0a43dec 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0

-Main-Class: com.sneed.pkrandom.newgui.NewRandomizerGUI

+Main-Class: com.pkrandom.newgui.NewRandomizerGUI

 

diff --git a/src/com/sneed/pkrandom/CustomNamesSet.java b/src/com/pkrandom/CustomNamesSet.java
index 45d373c..0dac51d 100644
--- a/src/com/sneed/pkrandom/CustomNamesSet.java
+++ b/src/com/pkrandom/CustomNamesSet.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  CustomNamesSet.java - handles functionality related to custom names.  --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/FileFunctions.java b/src/com/pkrandom/FileFunctions.java
index d2c8d8f..83b2112 100755
--- a/src/com/sneed/pkrandom/FileFunctions.java
+++ b/src/com/pkrandom/FileFunctions.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  FileFunctions.java - functions relating to file I/O.                  --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -73,7 +72,7 @@ public class FileFunctions {
                 return true;
             }
         }
-        return FileFunctions.class.getResource("/com/sneed/pkrandom/config/" + filename) != null;
+        return FileFunctions.class.getResource("/com/pkrandom/config/" + filename) != null;
     }
 
     public static InputStream openConfig(String filename) throws FileNotFoundException {
@@ -87,7 +86,7 @@ public class FileFunctions {
                 return new FileInputStream(fh);
             }
         }
-        return FileFunctions.class.getResourceAsStream("/com/sneed/pkrandom/config/" + filename);
+        return FileFunctions.class.getResourceAsStream("/com/pkrandom/config/" + filename);
     }
 
     public static CustomNamesSet getCustomNames() throws IOException {
@@ -257,7 +256,7 @@ public class FileFunctions {
     }
 
     private static byte[] getCodeTweakFile(String filename) throws IOException {
-        InputStream is = FileFunctions.class.getResourceAsStream("/com/sneed/pkrandom/patches/" + filename);
+        InputStream is = FileFunctions.class.getResourceAsStream("/com/pkrandom/patches/" + filename);
         byte[] buf = readFullyIntoBuffer(is, is.available());
         is.close();
         return buf;
diff --git a/src/com/sneed/pkrandom/GFXFunctions.java b/src/com/pkrandom/GFXFunctions.java
index 644b349..e5d5426 100644
--- a/src/com/sneed/pkrandom/GFXFunctions.java
+++ b/src/com/pkrandom/GFXFunctions.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  GFXFunctions.java - functions relating to graphics rendering.         --*/
 /*--                      Mainly used for rendering the sprites.            --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/MiscTweak.java b/src/com/pkrandom/MiscTweak.java
index 45f5f51..5640a13 100755
--- a/src/com/sneed/pkrandom/MiscTweak.java
+++ b/src/com/pkrandom/MiscTweak.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  MiscTweak.java - represents a miscellaneous tweak that can be applied --*/
 /*--                   to some or all games that the randomizer supports.   --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -33,7 +32,7 @@ public class MiscTweak implements Comparable<MiscTweak> {
 
     public static final int NO_MISC_TWEAKS = 0;
 
-    private static final ResourceBundle bundle = ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle");
+    private static final ResourceBundle bundle = ResourceBundle.getBundle("com/pkrandom/newgui/Bundle");
 
     public static List<MiscTweak> allTweaks = new ArrayList<>();
 
diff --git a/src/com/sneed/pkrandom/RandomSource.java b/src/com/pkrandom/RandomSource.java
index 97eef30..2ebbcde 100755
--- a/src/com/sneed/pkrandom/RandomSource.java
+++ b/src/com/pkrandom/RandomSource.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  RandomSource.java - functions as a centralized source of randomness   --*/
@@ -6,7 +6,6 @@ package com.sneed.pkrandom;
 /*--                      ROM consistently.                                 --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/Randomizer.java b/src/com/pkrandom/Randomizer.java
index a5622a3..ac7f932 100644
--- a/src/com/sneed/pkrandom/Randomizer.java
+++ b/src/com/pkrandom/Randomizer.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom;

+package com.pkrandom;

 

 /*----------------------------------------------------------------------------*/

 /*--  Randomizer.java - Can randomize a file based on settings.             --*/

 /*--                    Output varies by seed.                              --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -29,9 +28,9 @@ import java.io.OutputStream;
 import java.io.PrintStream;

 import java.util.*;

 

-import com.sneed.pkrandom.pokemon.*;

-import com.sneed.pkrandom.romhandlers.Gen1RomHandler;

-import com.sneed.pkrandom.romhandlers.RomHandler;

+import com.pkrandom.pokemon.*;

+import com.pkrandom.romhandlers.Gen1RomHandler;

+import com.pkrandom.romhandlers.RomHandler;

 

 // Can randomize a file based on settings. Output varies by seed.

 public class Randomizer {

diff --git a/src/com/sneed/pkrandom/RomFunctions.java b/src/com/pkrandom/RomFunctions.java
index 727d817..fb123dd 100755
--- a/src/com/sneed/pkrandom/RomFunctions.java
+++ b/src/com/pkrandom/RomFunctions.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  RomFunctions.java - contains functions useful throughout the program. --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -31,10 +30,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.sneed.pkrandom.pokemon.Evolution;
-import com.sneed.pkrandom.pokemon.MoveLearnt;
-import com.sneed.pkrandom.pokemon.Pokemon;
-import com.sneed.pkrandom.romhandlers.RomHandler;
+import com.pkrandom.pokemon.Evolution;
+import com.pkrandom.pokemon.MoveLearnt;
+import com.pkrandom.pokemon.Pokemon;
+import com.pkrandom.romhandlers.RomHandler;
 
 public class RomFunctions {
 
diff --git a/src/com/sneed/pkrandom/Settings.java b/src/com/pkrandom/Settings.java
index aba65be..eb2cf36 100644
--- a/src/com/sneed/pkrandom/Settings.java
+++ b/src/com/pkrandom/Settings.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom;

+package com.pkrandom;

 

 /*----------------------------------------------------------------------------*/

 /*--  Settings.java - encapsulates a configuration of settings used by the  --*/

@@ -6,7 +6,6 @@ package com.sneed.pkrandom;
 /*--                  target game.                                          --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -36,14 +35,14 @@ import java.util.Base64;
 import java.util.List;

 import java.util.zip.CRC32;

 

-import com.sneed.pkrandom.pokemon.ExpCurve;

-import com.sneed.pkrandom.pokemon.GenRestrictions;

-import com.sneed.pkrandom.pokemon.Pokemon;

-import com.sneed.pkrandom.romhandlers.Gen1RomHandler;

-import com.sneed.pkrandom.romhandlers.Gen2RomHandler;

-import com.sneed.pkrandom.romhandlers.Gen3RomHandler;

-import com.sneed.pkrandom.romhandlers.Gen5RomHandler;

-import com.sneed.pkrandom.romhandlers.RomHandler;

+import com.pkrandom.pokemon.ExpCurve;

+import com.pkrandom.pokemon.GenRestrictions;

+import com.pkrandom.pokemon.Pokemon;

+import com.pkrandom.romhandlers.Gen1RomHandler;

+import com.pkrandom.romhandlers.Gen2RomHandler;

+import com.pkrandom.romhandlers.Gen3RomHandler;

+import com.pkrandom.romhandlers.Gen5RomHandler;

+import com.pkrandom.romhandlers.RomHandler;

 

 public class Settings {

 

diff --git a/src/com/sneed/pkrandom/SettingsUpdater.java b/src/com/pkrandom/SettingsUpdater.java
index b775814..eabab32 100644
--- a/src/com/sneed/pkrandom/SettingsUpdater.java
+++ b/src/com/pkrandom/SettingsUpdater.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  SettingsUpdater.java - handles the process of updating a Settings file--*/
@@ -7,7 +7,6 @@ package com.sneed.pkrandom;
 /*--                         the current version.                           --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/SysConstants.java b/src/com/pkrandom/SysConstants.java
index 9405404..350151e 100644
--- a/src/com/sneed/pkrandom/SysConstants.java
+++ b/src/com/pkrandom/SysConstants.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  SysConstants.java - contains constants not related to the             --*/
@@ -6,7 +6,6 @@ package com.sneed.pkrandom;
 /*--                      relating to file I/O and the updating system.     --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -30,8 +29,8 @@ import java.io.File;
 
 public class SysConstants {
 
-    public static final String AUTOUPDATE_URL = "http://pokehacks.sneed.com/randomizer/autoupdate/";
-    public static final String WEBSITE_URL = "http://pokehacks.sneed.com/randomizer/";
+    public static final String AUTOUPDATE_URL = "http://pokehacks.dabomstew.com/randomizer/autoupdate/";
+    public static final String WEBSITE_URL = "http://pokehacks.dabomstew.com/randomizer/";
     public static final String WEBSITE_URL_ZX = "https://github.com/Ajarmar/universal-pokemon-randomizer-zx/releases";
     public static final String WIKI_URL_ZX = "https://github.com/Ajarmar/universal-pokemon-randomizer-zx/wiki";
     public static final String API_URL_ZX = "https://api.github.com/repos/ajarmar/universal-pokemon-randomizer-zx/releases/latest";
diff --git a/src/com/sneed/pkrandom/Utils.java b/src/com/pkrandom/Utils.java
index 07d211a..d527faa 100644
--- a/src/com/sneed/pkrandom/Utils.java
+++ b/src/com/pkrandom/Utils.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  Utils.java - contains functions related to specific parts of the      --*/
@@ -7,7 +7,6 @@ package com.sneed.pkrandom;
 /*--               from GUI code.                                           --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -37,8 +36,8 @@ import java.nio.ByteBuffer;
 import java.util.Base64;
 import java.util.zip.CRC32;
 
-import com.sneed.pkrandom.exceptions.InvalidSupplementFilesException;
-import com.sneed.pkrandom.newgui.NewRandomizerGUI;
+import com.pkrandom.exceptions.InvalidSupplementFilesException;
+import com.pkrandom.newgui.NewRandomizerGUI;
 
 public class Utils {
 
diff --git a/src/com/sneed/pkrandom/Version.java b/src/com/pkrandom/Version.java
index df30fe2..d30aa83 100644
--- a/src/com/sneed/pkrandom/Version.java
+++ b/src/com/pkrandom/Version.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom;
+package com.pkrandom;
 
 /*----------------------------------------------------------------------------*/
 /*--  Version.java - contains information about the randomizer's versions   --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/cli/CliRandomizer.java b/src/com/pkrandom/cli/CliRandomizer.java
index 4323197..e04abbf 100644
--- a/src/com/sneed/pkrandom/cli/CliRandomizer.java
+++ b/src/com/pkrandom/cli/CliRandomizer.java
@@ -1,10 +1,10 @@
-package com.sneed.pkrandom.cli;
+package com.pkrandom.cli;
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.RandomSource;
-import com.sneed.pkrandom.Randomizer;
-import com.sneed.pkrandom.Settings;
-import com.sneed.pkrandom.romhandlers.*;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.RandomSource;
+import com.pkrandom.Randomizer;
+import com.pkrandom.Settings;
+import com.pkrandom.romhandlers.*;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -14,7 +14,7 @@ import java.util.ResourceBundle;
 
 public class CliRandomizer {
 
-    private final static ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle");
+    private final static ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/pkrandom/newgui/Bundle");
 
     private static boolean performDirectRandomization(String settingsFilePath, String sourceRomFilePath,
                                                       String destinationRomFilePath, boolean saveAsDirectory,
@@ -35,7 +35,7 @@ public class CliRandomizer {
             File fh = new File(settingsFilePath);
             FileInputStream fis = new FileInputStream(fh);
             settings = Settings.read(fis);
-            // taken from com.sneed.pkrandom.newgui.NewRandomizerGUI.saveROM, set distinctly from all other settings
+            // taken from com.pkrandom.newgui.NewRandomizerGUI.saveROM, set distinctly from all other settings
             settings.setCustomNames(FileFunctions.getCustomNames());
             fis.close();
         } catch (UnsupportedOperationException | IllegalArgumentException | IOException ex) {
diff --git a/src/com/sneed/pkrandom/config/Generation4.tbl b/src/com/pkrandom/config/Generation4.tbl
index 1354430..1354430 100755
--- a/src/com/sneed/pkrandom/config/Generation4.tbl
+++ b/src/com/pkrandom/config/Generation4.tbl
diff --git a/src/com/sneed/pkrandom/config/Generation5.tbl b/src/com/pkrandom/config/Generation5.tbl
index 8c38355..8c38355 100755
--- a/src/com/sneed/pkrandom/config/Generation5.tbl
+++ b/src/com/pkrandom/config/Generation5.tbl
diff --git a/src/com/sneed/pkrandom/config/customnames.rncn b/src/com/pkrandom/config/customnames.rncn
index 7f1caff..7f1caff 100644
--- a/src/com/sneed/pkrandom/config/customnames.rncn
+++ b/src/com/pkrandom/config/customnames.rncn
diff --git a/src/com/sneed/pkrandom/config/gameboy_jpn.tbl b/src/com/pkrandom/config/gameboy_jpn.tbl
index e419887..e419887 100644
--- a/src/com/sneed/pkrandom/config/gameboy_jpn.tbl
+++ b/src/com/pkrandom/config/gameboy_jpn.tbl
diff --git a/src/com/sneed/pkrandom/config/gba_english.tbl b/src/com/pkrandom/config/gba_english.tbl
index 82f4e3a..82f4e3a 100755
--- a/src/com/sneed/pkrandom/config/gba_english.tbl
+++ b/src/com/pkrandom/config/gba_english.tbl
diff --git a/src/com/sneed/pkrandom/config/gba_jpn.tbl b/src/com/pkrandom/config/gba_jpn.tbl
index 90d1b94..90d1b94 100644
--- a/src/com/sneed/pkrandom/config/gba_jpn.tbl
+++ b/src/com/pkrandom/config/gba_jpn.tbl
diff --git a/src/com/sneed/pkrandom/config/gen1_offsets.ini b/src/com/pkrandom/config/gen1_offsets.ini
index 2598794..2598794 100755
--- a/src/com/sneed/pkrandom/config/gen1_offsets.ini
+++ b/src/com/pkrandom/config/gen1_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/gen2_offsets.ini b/src/com/pkrandom/config/gen2_offsets.ini
index 7033fe5..7033fe5 100755
--- a/src/com/sneed/pkrandom/config/gen2_offsets.ini
+++ b/src/com/pkrandom/config/gen2_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/gen3_offsets.ini b/src/com/pkrandom/config/gen3_offsets.ini
index 6d61d76..6d61d76 100755
--- a/src/com/sneed/pkrandom/config/gen3_offsets.ini
+++ b/src/com/pkrandom/config/gen3_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/gen4_offsets.ini b/src/com/pkrandom/config/gen4_offsets.ini
index 8cfc7d1..8cfc7d1 100755
--- a/src/com/sneed/pkrandom/config/gen4_offsets.ini
+++ b/src/com/pkrandom/config/gen4_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/gen5_offsets.ini b/src/com/pkrandom/config/gen5_offsets.ini
index b92c16f..b92c16f 100755
--- a/src/com/sneed/pkrandom/config/gen5_offsets.ini
+++ b/src/com/pkrandom/config/gen5_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/gen6_offsets.ini b/src/com/pkrandom/config/gen6_offsets.ini
index b97ebbe..b97ebbe 100644
--- a/src/com/sneed/pkrandom/config/gen6_offsets.ini
+++ b/src/com/pkrandom/config/gen6_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/gen7_offsets.ini b/src/com/pkrandom/config/gen7_offsets.ini
index 85f6a29..85f6a29 100644
--- a/src/com/sneed/pkrandom/config/gen7_offsets.ini
+++ b/src/com/pkrandom/config/gen7_offsets.ini
diff --git a/src/com/sneed/pkrandom/config/green_translation.tbl b/src/com/pkrandom/config/green_translation.tbl
index e01baf0..e01baf0 100755
--- a/src/com/sneed/pkrandom/config/green_translation.tbl
+++ b/src/com/pkrandom/config/green_translation.tbl
diff --git a/src/com/sneed/pkrandom/config/gsc_english.tbl b/src/com/pkrandom/config/gsc_english.tbl
index e5fe32a..e5fe32a 100755
--- a/src/com/sneed/pkrandom/config/gsc_english.tbl
+++ b/src/com/pkrandom/config/gsc_english.tbl
diff --git a/src/com/sneed/pkrandom/config/gsc_espita.tbl b/src/com/pkrandom/config/gsc_espita.tbl
index d9f603c..d9f603c 100755
--- a/src/com/sneed/pkrandom/config/gsc_espita.tbl
+++ b/src/com/pkrandom/config/gsc_espita.tbl
diff --git a/src/com/sneed/pkrandom/config/gsc_freger.tbl b/src/com/pkrandom/config/gsc_freger.tbl
index b896459..b896459 100755
--- a/src/com/sneed/pkrandom/config/gsc_freger.tbl
+++ b/src/com/pkrandom/config/gsc_freger.tbl
diff --git a/src/com/sneed/pkrandom/config/rby_english.tbl b/src/com/pkrandom/config/rby_english.tbl
index 88c21d6..88c21d6 100755
--- a/src/com/sneed/pkrandom/config/rby_english.tbl
+++ b/src/com/pkrandom/config/rby_english.tbl
diff --git a/src/com/sneed/pkrandom/config/rby_espita.tbl b/src/com/pkrandom/config/rby_espita.tbl
index 3ca057c..3ca057c 100755
--- a/src/com/sneed/pkrandom/config/rby_espita.tbl
+++ b/src/com/pkrandom/config/rby_espita.tbl
diff --git a/src/com/sneed/pkrandom/config/rby_freger.tbl b/src/com/pkrandom/config/rby_freger.tbl
index 93ad462..93ad462 100755
--- a/src/com/sneed/pkrandom/config/rby_freger.tbl
+++ b/src/com/pkrandom/config/rby_freger.tbl
diff --git a/src/com/sneed/pkrandom/config/realistic_gen1_english.tbl b/src/com/pkrandom/config/realistic_gen1_english.tbl
index 403e1d0..403e1d0 100644
--- a/src/com/sneed/pkrandom/config/realistic_gen1_english.tbl
+++ b/src/com/pkrandom/config/realistic_gen1_english.tbl
diff --git a/src/com/sneed/pkrandom/config/vietcrystal.tbl b/src/com/pkrandom/config/vietcrystal.tbl
index 71a06ce..71a06ce 100755
--- a/src/com/sneed/pkrandom/config/vietcrystal.tbl
+++ b/src/com/pkrandom/config/vietcrystal.tbl
diff --git a/src/com/sneed/pkrandom/constants/Abilities.java b/src/com/pkrandom/constants/Abilities.java
index f1b2eaa..ee4819d 100644
--- a/src/com/sneed/pkrandom/constants/Abilities.java
+++ b/src/com/pkrandom/constants/Abilities.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Abilities.java - defines an index number constant for every Ability.  --*/
diff --git a/src/com/sneed/pkrandom/constants/GBConstants.java b/src/com/pkrandom/constants/GBConstants.java
index d23bd21..bc47bb3 100644
--- a/src/com/sneed/pkrandom/constants/GBConstants.java
+++ b/src/com/pkrandom/constants/GBConstants.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  GBConstants.java - constants that are relevant for all of the GB      --*/
 /*--                     games                                              --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -25,7 +24,7 @@ package com.sneed.pkrandom.constants;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.pokemon.Type;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/com/sneed/pkrandom/constants/Gen1Constants.java b/src/com/pkrandom/constants/Gen1Constants.java
index 204608e..5b2b725 100644
--- a/src/com/sneed/pkrandom/constants/Gen1Constants.java
+++ b/src/com/pkrandom/constants/Gen1Constants.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen1Constants.java - Constants for Red/Green/Blue/Yellow              --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -28,9 +27,9 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.sneed.pkrandom.pokemon.ItemList;
-import com.sneed.pkrandom.pokemon.Trainer;
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.pokemon.ItemList;
+import com.pkrandom.pokemon.Trainer;
+import com.pkrandom.pokemon.Type;
 
 public class Gen1Constants {
 
diff --git a/src/com/sneed/pkrandom/constants/Gen1Items.java b/src/com/pkrandom/constants/Gen1Items.java
index bffbe0d..8374ed1 100644
--- a/src/com/sneed/pkrandom/constants/Gen1Items.java
+++ b/src/com/pkrandom/constants/Gen1Items.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen1Items.java - defines an index number constant for every item in   --*/
diff --git a/src/com/sneed/pkrandom/constants/Gen2Constants.java b/src/com/pkrandom/constants/Gen2Constants.java
index fd4992e..d567947 100644
--- a/src/com/sneed/pkrandom/constants/Gen2Constants.java
+++ b/src/com/pkrandom/constants/Gen2Constants.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen2Constants.java - Constants for Gold/Silver/Crystal                --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -28,9 +27,9 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.sneed.pkrandom.pokemon.ItemList;
-import com.sneed.pkrandom.pokemon.Trainer;
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.pokemon.ItemList;
+import com.pkrandom.pokemon.Trainer;
+import com.pkrandom.pokemon.Type;
 
 public class Gen2Constants {
 
diff --git a/src/com/sneed/pkrandom/constants/Gen2Items.java b/src/com/pkrandom/constants/Gen2Items.java
index ed16f98..cd45ad9 100644
--- a/src/com/sneed/pkrandom/constants/Gen2Items.java
+++ b/src/com/pkrandom/constants/Gen2Items.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen2Items.java - defines an index number constant for every item in   --*/
diff --git a/src/com/sneed/pkrandom/constants/Gen3Constants.java b/src/com/pkrandom/constants/Gen3Constants.java
index 90f6ecd..2f747d4 100644
--- a/src/com/sneed/pkrandom/constants/Gen3Constants.java
+++ b/src/com/pkrandom/constants/Gen3Constants.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen3Constants.java - Constants for Ruby/Sapphire/FR/LG/Emerald        --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -29,9 +28,9 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.sneed.pkrandom.pokemon.ItemList;
-import com.sneed.pkrandom.pokemon.Trainer;
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.pokemon.ItemList;
+import com.pkrandom.pokemon.Trainer;
+import com.pkrandom.pokemon.Type;
 
 public class Gen3Constants {
 
diff --git a/src/com/sneed/pkrandom/constants/Gen3Items.java b/src/com/pkrandom/constants/Gen3Items.java
index 0c9fd4d..8e02916 100644
--- a/src/com/sneed/pkrandom/constants/Gen3Items.java
+++ b/src/com/pkrandom/constants/Gen3Items.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen3Items.java - defines an index number constant for every item in   --*/
diff --git a/src/com/sneed/pkrandom/constants/Gen4Constants.java b/src/com/pkrandom/constants/Gen4Constants.java
index 71fd97f..91c5ff2 100644
--- a/src/com/sneed/pkrandom/constants/Gen4Constants.java
+++ b/src/com/pkrandom/constants/Gen4Constants.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen4Constants.java - Constants for DPPt and HGSS                      --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -29,7 +28,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.pokemon.*;
 
 public class Gen4Constants {
 
diff --git a/src/com/sneed/pkrandom/constants/Gen5Constants.java b/src/com/pkrandom/constants/Gen5Constants.java
index ef03ca1..e5e39ce 100644
--- a/src/com/sneed/pkrandom/constants/Gen5Constants.java
+++ b/src/com/pkrandom/constants/Gen5Constants.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.constants;

+package com.pkrandom.constants;

 

 /*----------------------------------------------------------------------------*/

 /*--  Gen5Constants.java - Constants for Black/White/Black 2/White 2        --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -29,10 +28,10 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;

 import java.util.stream.Stream;

 

-import com.sneed.pkrandom.pokemon.ItemList;

-import com.sneed.pkrandom.pokemon.MoveCategory;

-import com.sneed.pkrandom.pokemon.Trainer;

-import com.sneed.pkrandom.pokemon.Type;

+import com.pkrandom.pokemon.ItemList;

+import com.pkrandom.pokemon.MoveCategory;

+import com.pkrandom.pokemon.Trainer;

+import com.pkrandom.pokemon.Type;

 

 public class Gen5Constants {

 

diff --git a/src/com/sneed/pkrandom/constants/Gen6Constants.java b/src/com/pkrandom/constants/Gen6Constants.java
index 6e4aa3b..8a4be9d 100644
--- a/src/com/sneed/pkrandom/constants/Gen6Constants.java
+++ b/src/com/pkrandom/constants/Gen6Constants.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen6Constants.java - Constants for X/Y/Omega Ruby/Alpha Sapphire      --*/
@@ -23,7 +23,7 @@ package com.sneed.pkrandom.constants;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.pokemon.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/com/sneed/pkrandom/constants/Gen7Constants.java b/src/com/pkrandom/constants/Gen7Constants.java
index 6dca571..2c1d9a1 100644
--- a/src/com/sneed/pkrandom/constants/Gen7Constants.java
+++ b/src/com/pkrandom/constants/Gen7Constants.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen7Constants.java - Constants for Sun/Moon/Ultra Sun/Ultra Moon      --*/
@@ -23,10 +23,10 @@ package com.sneed.pkrandom.constants;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.pokemon.ItemList;
-import com.sneed.pkrandom.pokemon.MoveCategory;
-import com.sneed.pkrandom.pokemon.Trainer;
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.pokemon.ItemList;
+import com.pkrandom.pokemon.MoveCategory;
+import com.pkrandom.pokemon.Trainer;
+import com.pkrandom.pokemon.Type;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/com/sneed/pkrandom/constants/GlobalConstants.java b/src/com/pkrandom/constants/GlobalConstants.java
index fa41d5c..c4d1352 100644
--- a/src/com/sneed/pkrandom/constants/GlobalConstants.java
+++ b/src/com/pkrandom/constants/GlobalConstants.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  GlobalConstants.java - constants that are relevant for multiple games --*/
 /*--                         in the Pokemon series                          --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -25,7 +24,7 @@ package com.sneed.pkrandom.constants;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.pokemon.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/com/sneed/pkrandom/constants/Items.java b/src/com/pkrandom/constants/Items.java
index 80ab373..aecf237 100644
--- a/src/com/sneed/pkrandom/constants/Items.java
+++ b/src/com/pkrandom/constants/Items.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Items.java - defines an index number constant for every item in the   --*/
diff --git a/src/com/sneed/pkrandom/constants/Moves.java b/src/com/pkrandom/constants/Moves.java
index 0e18183..494e8f2 100644
--- a/src/com/sneed/pkrandom/constants/Moves.java
+++ b/src/com/pkrandom/constants/Moves.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Moves.java - defines an index number constant for every Move.         --*/
diff --git a/src/com/sneed/pkrandom/constants/N3DSConstants.java b/src/com/pkrandom/constants/N3DSConstants.java
index bc5b41d..f33fe23 100644
--- a/src/com/sneed/pkrandom/constants/N3DSConstants.java
+++ b/src/com/pkrandom/constants/N3DSConstants.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  N3DSConstants.java - constants that are relevant for all of the 3DS   --*/
diff --git a/src/com/sneed/pkrandom/constants/Species.java b/src/com/pkrandom/constants/Species.java
index ada3206..74dba94 100644
--- a/src/com/sneed/pkrandom/constants/Species.java
+++ b/src/com/pkrandom/constants/Species.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.constants;
+package com.pkrandom.constants;
 
 /*----------------------------------------------------------------------------*/
 /*--  Species.java - defines a species number constant for every Pokemon.   --*/
diff --git a/src/com/sneed/pkrandom/ctr/AMX.java b/src/com/pkrandom/ctr/AMX.java
index 41687eb..d99ba7f 100644
--- a/src/com/sneed/pkrandom/ctr/AMX.java
+++ b/src/com/pkrandom/ctr/AMX.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  AMX.java - class for handling AMX script archives                     --*/
@@ -22,8 +22,8 @@ package com.sneed.pkrandom.ctr;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.exceptions.RandomizerIOException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/com/sneed/pkrandom/ctr/BFLIM.java b/src/com/pkrandom/ctr/BFLIM.java
index 9447e00..5bbb71a 100644
--- a/src/com/sneed/pkrandom/ctr/BFLIM.java
+++ b/src/com/pkrandom/ctr/BFLIM.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  BFLIM.java - class for reading/parsing BFLIM images.                  --*/
@@ -23,7 +23,7 @@ package com.sneed.pkrandom.ctr;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 import java.awt.image.BufferedImage;
 
diff --git a/src/com/sneed/pkrandom/ctr/GARCArchive.java b/src/com/pkrandom/ctr/GARCArchive.java
index 387c23d..cd504c4 100644
--- a/src/com/sneed/pkrandom/ctr/GARCArchive.java
+++ b/src/com/pkrandom/ctr/GARCArchive.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  GARCArchive.java - class for packing/unpacking GARC archives          --*/
diff --git a/src/com/sneed/pkrandom/ctr/Mini.java b/src/com/pkrandom/ctr/Mini.java
index 64e94ba..82daa08 100644
--- a/src/com/sneed/pkrandom/ctr/Mini.java
+++ b/src/com/pkrandom/ctr/Mini.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  Mini.java - class for packing/unpacking Mini archives                 --*/
@@ -21,7 +21,7 @@ package com.sneed.pkrandom.ctr;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/com/sneed/pkrandom/ctr/NCCH.java b/src/com/pkrandom/ctr/NCCH.java
index 8db5a4e..9a326a5 100644
--- a/src/com/sneed/pkrandom/ctr/NCCH.java
+++ b/src/com/pkrandom/ctr/NCCH.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  NCCH.java - a base class for dealing with 3DS NCCH ROM images.        --*/
@@ -21,11 +21,11 @@ package com.sneed.pkrandom.ctr;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.SysConstants;
-import com.sneed.pkrandom.exceptions.CannotWriteToLocationException;
-import com.sneed.pkrandom.exceptions.EncryptedROMException;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.SysConstants;
+import com.pkrandom.exceptions.CannotWriteToLocationException;
+import com.pkrandom.exceptions.EncryptedROMException;
+import com.pkrandom.exceptions.RandomizerIOException;
 import cuecompressors.BLZCoder;
 
 import java.io.*;
diff --git a/src/com/sneed/pkrandom/ctr/RomfsFile.java b/src/com/pkrandom/ctr/RomfsFile.java
index 63caccc..30e9f7c 100644
--- a/src/com/sneed/pkrandom/ctr/RomfsFile.java
+++ b/src/com/pkrandom/ctr/RomfsFile.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  RomfsFile.java - an entry in the romfs filesystem                     --*/
@@ -21,7 +21,7 @@ package com.sneed.pkrandom.ctr;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/com/sneed/pkrandom/ctr/SMDH.java b/src/com/pkrandom/ctr/SMDH.java
index 28442ba..070809b 100644
--- a/src/com/sneed/pkrandom/ctr/SMDH.java
+++ b/src/com/pkrandom/ctr/SMDH.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.ctr;
+package com.pkrandom.ctr;
 
 /*----------------------------------------------------------------------------*/
 /*--  NCCH.java - a base class for dealing with 3DS SMDH (icon.bin) files.  --*/
@@ -21,7 +21,7 @@ package com.sneed.pkrandom.ctr;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/src/com/sneed/pkrandom/exceptions/CannotWriteToLocationException.java b/src/com/pkrandom/exceptions/CannotWriteToLocationException.java
index 59f3adb..1948de2 100644
--- a/src/com/sneed/pkrandom/exceptions/CannotWriteToLocationException.java
+++ b/src/com/pkrandom/exceptions/CannotWriteToLocationException.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.exceptions;
+package com.pkrandom.exceptions;
 
 /*----------------------------------------------------------------------------*/
 /*--  CannotWriteToLocationException.java - exception for when a user tries --*/
diff --git a/src/com/sneed/pkrandom/exceptions/EncryptedROMException.java b/src/com/pkrandom/exceptions/EncryptedROMException.java
index 29962d6..4d787fc 100644
--- a/src/com/sneed/pkrandom/exceptions/EncryptedROMException.java
+++ b/src/com/pkrandom/exceptions/EncryptedROMException.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.exceptions;
+package com.pkrandom.exceptions;
 
 /*----------------------------------------------------------------------------*/
 /*--  EncryptedROMException.java - exception for when an encrypted 3DS ROM  --*/
diff --git a/src/com/sneed/pkrandom/exceptions/InvalidSupplementFilesException.java b/src/com/pkrandom/exceptions/InvalidSupplementFilesException.java
index 43ef1b4..4c62aed 100755
--- a/src/com/sneed/pkrandom/exceptions/InvalidSupplementFilesException.java
+++ b/src/com/pkrandom/exceptions/InvalidSupplementFilesException.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.exceptions;
+package com.pkrandom.exceptions;
 
 /*----------------------------------------------------------------------------*/
 /*--  InvalidSupplementFilesException.java - thrown when the trainer class  --*/
@@ -7,7 +7,6 @@ package com.sneed.pkrandom.exceptions;
 /*--                                         preset creator.                --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/exceptions/RandomizationException.java b/src/com/pkrandom/exceptions/RandomizationException.java
index 0f618b2..ef3ac34 100644
--- a/src/com/sneed/pkrandom/exceptions/RandomizationException.java
+++ b/src/com/pkrandom/exceptions/RandomizationException.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.exceptions;
+package com.pkrandom.exceptions;
 
 /*----------------------------------------------------------------------------*/
 /*--  RandomizerException.java - thrown for various errors during           --*/
 /*--                             randomization                              --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/exceptions/RandomizerIOException.java b/src/com/pkrandom/exceptions/RandomizerIOException.java
index 35cbee0..68a618c 100644
--- a/src/com/sneed/pkrandom/exceptions/RandomizerIOException.java
+++ b/src/com/pkrandom/exceptions/RandomizerIOException.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.exceptions;
+package com.pkrandom.exceptions;
 
 /*----------------------------------------------------------------------------*/
 /*--  RandomizerIOException.java - generic exception for various IO errors  --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/newgui/Bundle.properties b/src/com/pkrandom/newgui/Bundle.properties
index b3ad8b9..4ff82f2 100644
--- a/src/com/sneed/pkrandom/newgui/Bundle.properties
+++ b/src/com/pkrandom/newgui/Bundle.properties
@@ -1,7 +1,7 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
-GUI.versionLabel.text=Sneed's Pokemon Randomizer
+GUI.versionLabel.text=Pokemon Randomizer
 GUI.generalOptionsPanel.title=General Options
 GUI.limitPokemonCheckBox.text=Limit Pokemon
 GUI.limitPokemonCheckBox.toolTipText=<html>Select this to allow yourself to limit the Pokemon used by the randomization.<br /><b>If this box isn't checked all Pokemon will be allowed.</b>
@@ -343,7 +343,7 @@ GUI.miscNerfXAccuracyCheckBox.toolTipText=<html>X Accuracy in Generation 1 games
 GUI.miscNerfXAccuracyCheckBox.text=Nerf X Accuracy
 GUI.miscFixCritRateCheckBox.toolTipText=<html>Selecting this option will "fix" Generation 1's critical hit rate to be the same as the other games (1/16), instead of being based on Speed.<br />Focus Energy and Dire Hit will also be fixed to increase crit rate instead of decreasing it.<br />"High crit rate" moves such as Slash will have double the normal crit chance, like in later games.
 GUI.miscFixCritRateCheckBox.text="Fix" Crit Rate
-GUI.miscFastestTextCheckBox.toolTipText=<html>Selecting this option will make all text boxes in the game show up with minimum delay, regardless of the text speed the player sets in Options.<br /><b>Credit to sneed/Revo for Gen 3, Kaphotics for Gen 4, Ajarmar for Gen 5, and unknown cheat code makers for Gen 6/7</b>
+GUI.miscFastestTextCheckBox.toolTipText=<html>Selecting this option will make all text boxes in the game show up with minimum delay, regardless of the text speed the player sets in Options.<br />
 GUI.miscFastestTextCheckBox.text=Fastest Text
 GUI.miscRunningShoesIndoorsCheckBox.toolTipText=<html>Selecting this option will allow you to use the Running Shoes in any location, just like in later games.
 GUI.miscRunningShoesIndoorsCheckBox.text=Running Shoes Indoors
@@ -481,7 +481,7 @@ CodeTweaks.nerfXAcc.name=Nerf X Accuracy
 CodeTweaks.nerfXAcc.toolTipText=<html>X Accuracy in Generation 1 games is a pretty broken item, given that it gives 100% accuracy to any and all moves used.<br />Apply this code tweak to stop X Accuracy from working on sleep moves, trapping moves & one-hit KO moves.<br />Doing this means that the player cannot use X Accuracy and lock the opponents into infinite sleep/Wrap, nor can they just use one-hit KO moves on everything.<br />Applying this patch will also remove the one-hit KO moves from the "broken moves" list if you use that option, since they aren't really broken without X Accuracy.<br /><b>Credit to Mountebank for this patch.</b>
 CodeTweaks.critRateFix.name="Fix" Crit Rate
 CodeTweaks.critRateFix.toolTipText=<html>Selecting this option will "fix" Generation 1's critical hit rate to be the same as the other games (1/16), instead of being based on Speed.<br />Focus Energy and Dire Hit will also be fixed to increase crit rate instead of decreasing it.<br />"High crit rate" moves such as Slash will have double the normal crit chance, like in later games.
-CodeTweaks.fastestText.toolTipText=<html>Selecting this option will make all text boxes in the game show up with minimum delay, regardless of the text speed the player sets in Options.<br /><b>Credit to sneed/Revo for Gen 3, Kaphotics for Gen 4, Ajarmar for Gen 5, and unknown cheat code makers for Gen 6/7</b>
+CodeTweaks.fastestText.toolTipText=<html>Selecting this option will make all text boxes in the game show up with minimum delay, regardless of the text speed the player sets in Options.<br />
 CodeTweaks.fastestText.name=Fastest Text
 CodeTweaks.runningShoes.toolTipText=<html>Selecting this option will allow you to use the Running Shoes in any location, just like in later games.
 CodeTweaks.runningShoes.name=Running Shoes Indoors
@@ -591,7 +591,7 @@ GUI.totpPercentageLevelModifierCheckBox.toolTipText=Checking this will enable a
 GUI.totpAllyUnchangedRadioButton.toolTipText=Don't change Ally Pokemon.
 GUI.pmsEvolutionMovesCheckBox.text=Evolution Moves for All Pokemon
 GUI.pmsEvolutionMovesCheckBox.toolTipText=<html>Selecting this option will cause every Pokemon to learn a move upon evolution.<br /><br /><b>Use carefully with Sun/Moon 1.0 - </b>due to a glitch, if a Pokemon has an evolution move and also learns a move<br />on the level that it evolved at, it will only learn the evolution move upon evolving.
-GUI.windowTitle=Sneed's Pokemon Randomizer
+GUI.windowTitle=Pokemon Randomizer
 GUI.paWeighDuplicatesTogetherCheckBox.text=Combine Duplicate Abilities
 GUI.paWeighDuplicatesTogetherCheckBox.toolTipText=<html>This setting causes abilities that have the exact same effect to be considered as the same ability for randomization probability purposes. Every variation of the respective abilities can still appear.<br />This applies to:<br /><b>Gen 3+:</b> Insomnia/Vital Spirit, Clear Body/White Smoke, Huge Power/Pure Power, Battle Armor/Shell Armor, Cloud Nine/Air Lock<br /><b>Gen 4+:</b> Filter/Solid Rock<br /><b>Gen 5+:</b> Rough Skin/Iron Barbs, Mold Breaker/Turboblaze/Teravolt<br /><b>Gen 7+:</b> Wimp Out/Emergency Exit, Queenly Majesty/Dazzling, Gooey/Tangling Hair, Receiver/Power of Alchemy, Clear Body/White Smoke/Full Metal Body, Multiscale/Shadow Shield, Filter/Solid Rock/Prism Armor
 GUI.gameUpdateApplied=<html>Update saved for game: %s.<br />Note that if the update file is moved or renamed, you will have to reapply it.
diff --git a/src/com/sneed/pkrandom/newgui/CustomNamesEditorDialog.java b/src/com/pkrandom/newgui/CustomNamesEditorDialog.java
index 0b1a71f..07954ed 100644
--- a/src/com/sneed/pkrandom/newgui/CustomNamesEditorDialog.java
+++ b/src/com/pkrandom/newgui/CustomNamesEditorDialog.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  CustomNamesEditorDialog.java - a GUI interface to allow users to edit --*/
 /*--                                 their custom names for trainers etc.   --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -25,9 +24,9 @@ package com.sneed.pkrandom.newgui;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.CustomNamesSet;
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.SysConstants;
+import com.pkrandom.CustomNamesSet;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.SysConstants;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -207,7 +206,7 @@ public class CustomNamesEditorDialog extends javax.swing.JDialog {
         closeBtn = new javax.swing.JButton();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
-        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle");
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/pkrandom/newgui/Bundle");
         setTitle(bundle.getString("CustomNamesEditorDialog.title"));
         setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
         addWindowListener(new java.awt.event.WindowAdapter() {
diff --git a/src/com/sneed/pkrandom/newgui/GameUpdateFilter.java b/src/com/pkrandom/newgui/GameUpdateFilter.java
index 261419e..50866bb 100644
--- a/src/com/sneed/pkrandom/newgui/GameUpdateFilter.java
+++ b/src/com/pkrandom/newgui/GameUpdateFilter.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*-- GameUpdateFilter.java - a file filter for 3DS game updates.            --*/
diff --git a/src/com/sneed/pkrandom/newgui/NewGenerationLimitDialog.form b/src/com/pkrandom/newgui/NewGenerationLimitDialog.form
index e3749d8..1f87054 100644
--- a/src/com/sneed/pkrandom/newgui/NewGenerationLimitDialog.form
+++ b/src/com/pkrandom/newgui/NewGenerationLimitDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.sneed.pkrandom.newgui.NewGenerationLimitDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.pkrandom.newgui.NewGenerationLimitDialog">
   <grid id="27dc6" binding="mainPanel" layout-manager="GridBagLayout">
     <constraints>
       <xy x="20" y="20" width="585" height="400"/>
@@ -111,7 +111,7 @@
         </constraints>
         <properties>
           <font style="1"/>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GenerationLimitDialog.warningXYLabel.text"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GenerationLimitDialog.warningXYLabel.text"/>
         </properties>
       </component>
       <hspacer id="1601f">
diff --git a/src/com/sneed/pkrandom/newgui/NewGenerationLimitDialog.java b/src/com/pkrandom/newgui/NewGenerationLimitDialog.java
index 8ba7ecb..9281749 100644
--- a/src/com/sneed/pkrandom/newgui/NewGenerationLimitDialog.java
+++ b/src/com/pkrandom/newgui/NewGenerationLimitDialog.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  NewGenerationLimitDialog.java - a GUI interface to allow users to     --*/
@@ -6,7 +6,6 @@ package com.sneed.pkrandom.newgui;
 /*--                                  their generation of origin.           --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -26,7 +25,7 @@ package com.sneed.pkrandom.newgui;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.pokemon.GenRestrictions;
+import com.pkrandom.pokemon.GenRestrictions;
 
 import javax.swing.*;
 
@@ -117,7 +116,7 @@ public class NewGenerationLimitDialog extends javax.swing.JDialog {
 
     private void initComponents() {
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle");
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/pkrandom/newgui/Bundle");
         setTitle(bundle.getString("GenerationLimitDialog.title"));
         gen1CheckBox.addActionListener(ev -> enableAndDisableBoxes());
         gen2CheckBox.addActionListener(ev -> enableAndDisableBoxes());
diff --git a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form b/src/com/pkrandom/newgui/NewRandomizerGUI.form
index 8cec194..c7c7a4e 100644
--- a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form
+++ b/src/com/pkrandom/newgui/NewRandomizerGUI.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.sneed.pkrandom.newgui.NewRandomizerGUI">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.pkrandom.newgui.NewRandomizerGUI">
   <grid id="27dc6" binding="mainPanel" layout-manager="GridBagLayout">
     <constraints>
       <xy x="7" y="20" width="1350" height="1103"/>
@@ -17,7 +17,7 @@
         <properties>
           <enabled value="true"/>
         </properties>
-        <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.generalOptionsPanel.title">
+        <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.generalOptionsPanel.title">
           <font style="1"/>
           <title-color color="-16777216"/>
           <color color="-4473925"/>
@@ -30,8 +30,8 @@
             </constraints>
             <properties>
               <enabled value="false"/>
-              <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.raceModeCheckBox.text"/>
-              <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.raceModeCheckBox.toolTipText"/>
+              <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.raceModeCheckBox.text"/>
+              <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.raceModeCheckBox.toolTipText"/>
             </properties>
           </component>
           <component id="d9ef2" class="javax.swing.JCheckBox" binding="limitPokemonCheckBox">
@@ -42,7 +42,7 @@
             <properties>
               <enabled value="false"/>
               <text value=""/>
-              <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.limitPokemonCheckBox.toolTipText"/>
+              <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.limitPokemonCheckBox.toolTipText"/>
             </properties>
           </component>
           <component id="cab02" class="javax.swing.JButton" binding="limitPokemonButton" default-binding="true">
@@ -52,7 +52,7 @@
             </constraints>
             <properties>
               <enabled value="false"/>
-              <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.limitPokemonCheckBox.text"/>
+              <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.limitPokemonCheckBox.text"/>
             </properties>
           </component>
           <component id="41e69" class="javax.swing.JCheckBox" binding="noIrregularAltFormesCheckBox" default-binding="true">
@@ -62,8 +62,8 @@
             </constraints>
             <properties>
               <enabled value="false"/>
-              <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.noIrregularAltFormesCheckBox.text"/>
-              <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.noIrregularAltFormesCheckBox.toolTipText"/>
+              <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.noIrregularAltFormesCheckBox.text"/>
+              <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.noIrregularAltFormesCheckBox.toolTipText"/>
             </properties>
           </component>
         </children>
@@ -80,7 +80,7 @@
           <gridbag weightx="0.1" weighty="0.0"/>
         </constraints>
         <properties/>
-        <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.romInformationPanel.title">
+        <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.romInformationPanel.title">
           <font style="1"/>
         </border>
         <children>
@@ -98,7 +98,7 @@
             <properties>
               <horizontalAlignment value="0"/>
               <labelFor value=""/>
-              <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.noRomLoaded"/>
+              <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.noRomLoaded"/>
             </properties>
           </component>
           <component id="41f42" class="javax.swing.JLabel" binding="romCodeLabel">
@@ -137,7 +137,7 @@
         <children>
           <grid id="54bda" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.pokemonTraitsPanel.title"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.pokemonTraitsPanel.title"/>
             </constraints>
             <properties/>
             <border type="none"/>
@@ -148,7 +148,7 @@
                   <gridbag top="5" left="0" bottom="0" right="0" weightx="0.1" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.pbsPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.pbsPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -159,8 +159,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="f556c">
@@ -176,8 +176,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsShuffleRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsShuffleRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsShuffleRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsShuffleRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="8625b" class="javax.swing.JRadioButton" binding="pbsLegendariesSlowRadioButton">
@@ -187,8 +187,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsLegendariesSlowRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsLegendariesSlowRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsLegendariesSlowRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsLegendariesSlowRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="9be58" class="javax.swing.JRadioButton" binding="pbsStrongLegendariesSlowRadioButton">
@@ -198,8 +198,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsStrongLegendariesSlowRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsStrongLegendariesSlowRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsStrongLegendariesSlowRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsStrongLegendariesSlowRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="db430" class="javax.swing.JCheckBox" binding="pbsStandardizeEXPCurvesCheckBox">
@@ -209,8 +209,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsStandardizeEXPCurvesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsStandardizeEXPCurvesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsStandardizeEXPCurvesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsStandardizeEXPCurvesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="986c1" class="javax.swing.JCheckBox" binding="pbsFollowEvolutionsCheckBox" default-binding="true">
@@ -220,8 +220,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsFollowEvolutionsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsFollowEvolutionsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsFollowEvolutionsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsFollowEvolutionsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="fb58a">
@@ -249,8 +249,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsUpdateBaseStatsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsUpdateBaseStatsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsUpdateBaseStatsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsUpdateBaseStatsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="6768d" class="javax.swing.JCheckBox" binding="pbsFollowMegaEvosCheckBox">
@@ -260,8 +260,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsFollowMegaEvosCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsFollowMegaEvosCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsFollowMegaEvosCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsFollowMegaEvosCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4d643" class="javax.swing.JComboBox" binding="pbsUpdateComboBox">
@@ -295,8 +295,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsAssignEvoStatsRandomlyCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsAssignEvoStatsRandomlyCheckBox.tooltipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsAssignEvoStatsRandomlyCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsAssignEvoStatsRandomlyCheckBox.tooltipText"/>
                     </properties>
                   </component>
                   <component id="4535b" class="javax.swing.JRadioButton" binding="pbsRandomRadioButton" default-binding="true">
@@ -306,8 +306,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="213c9" class="javax.swing.JRadioButton" binding="pbsAllMediumFastRadioButton">
@@ -317,8 +317,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsAllMediumFastRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pbsAllMediumFastRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsAllMediumFastRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pbsAllMediumFastRadioButton.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -347,7 +347,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.ptPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.ptPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -359,8 +359,8 @@
                     <properties>
                       <enabled value="false"/>
                       <hideActionText value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="ab767">
@@ -394,8 +394,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptRandomFollowEvolutionsRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptRandomFollowEvolutionsRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptRandomFollowEvolutionsRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptRandomFollowEvolutionsRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="45dd7" class="javax.swing.JRadioButton" binding="ptRandomCompletelyRadioButton" default-binding="true">
@@ -405,8 +405,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptRandomCompletelyRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptRandomCompletelyRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptRandomCompletelyRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptRandomCompletelyRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="360ba" class="javax.swing.JCheckBox" binding="ptFollowMegaEvosCheckBox">
@@ -416,8 +416,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptFollowMegaEvosCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptFollowMegaEvosCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptFollowMegaEvosCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptFollowMegaEvosCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="237b6" class="javax.swing.JCheckBox" binding="ptIsDualTypeCheckBox">
@@ -428,8 +428,8 @@
                     <properties>
                       <enabled value="false"/>
                       <selected value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptForceDualTypeCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.ptForceDualTypeCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptForceDualTypeCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.ptForceDualTypeCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -440,7 +440,7 @@
                   <gridbag weightx="0.9" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.paPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.paPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -451,8 +451,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="559d2">
@@ -486,8 +486,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="97cb8" class="javax.swing.JCheckBox" binding="paAllowWonderGuardCheckBox">
@@ -497,8 +497,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paAllowWonderGuardCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paAllowWonderGuardCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paAllowWonderGuardCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paAllowWonderGuardCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="18744" class="javax.swing.JCheckBox" binding="paFollowEvolutionsCheckBox" default-binding="true">
@@ -508,8 +508,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paFollowEvolutionsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paFollowEvolutionsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paFollowEvolutionsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paFollowEvolutionsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="5694" class="javax.swing.JLabel">
@@ -518,7 +518,7 @@
                       <gridbag top="5" left="0" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paBanLabel.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paBanLabel.text"/>
                     </properties>
                   </component>
                   <component id="5afb0" class="javax.swing.JCheckBox" binding="paTrappingAbilitiesCheckBox">
@@ -528,8 +528,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paTrappingAbilitiesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paTrappingAbilitiesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paTrappingAbilitiesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paTrappingAbilitiesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="76ea8" class="javax.swing.JCheckBox" binding="paNegativeAbilitiesCheckBox">
@@ -540,8 +540,8 @@
                     <properties>
                       <enabled value="false"/>
                       <selected value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paNegativeAbilitiesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paNegativeAbilitiesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paNegativeAbilitiesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paNegativeAbilitiesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4ac30" class="javax.swing.JCheckBox" binding="paBadAbilitiesCheckBox">
@@ -551,8 +551,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paBadAbilitiesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paBadAbilitiesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paBadAbilitiesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paBadAbilitiesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="652d7" class="javax.swing.JCheckBox" binding="paWeighDuplicatesTogetherCheckBox">
@@ -562,8 +562,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paWeighDuplicatesTogetherCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paWeighDuplicatesTogetherCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paWeighDuplicatesTogetherCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paWeighDuplicatesTogetherCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="bae4a" class="javax.swing.JCheckBox" binding="paEnsureTwoAbilitiesCheckbox">
@@ -573,8 +573,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paEnsureTwoAbilitiesCheckbox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paEnsureTwoAbilitiesCheckbox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paEnsureTwoAbilitiesCheckbox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paEnsureTwoAbilitiesCheckbox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b3439" class="javax.swing.JCheckBox" binding="paFollowMegaEvosCheckBox">
@@ -584,8 +584,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paFollowMegaEvosCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.paFollowMegaEvosCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paFollowMegaEvosCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.paFollowMegaEvosCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -596,7 +596,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.pePanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.pePanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -607,8 +607,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="25cc7">
@@ -642,8 +642,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b5878" class="javax.swing.JCheckBox" binding="peSimilarStrengthCheckBox">
@@ -653,8 +653,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peSimilarStrengthCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peSimilarStrengthCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peSimilarStrengthCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peSimilarStrengthCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4eb8e" class="javax.swing.JCheckBox" binding="peSameTypingCheckBox">
@@ -664,8 +664,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peSameTypingCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peSameTypingCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peSameTypingCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peSameTypingCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="6e101" class="javax.swing.JCheckBox" binding="peLimitEvolutionsToThreeCheckBox">
@@ -675,8 +675,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peLimitEvolutionsToThreeCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peLimitEvolutionsToThreeCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peLimitEvolutionsToThreeCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peLimitEvolutionsToThreeCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="52db5" class="javax.swing.JCheckBox" binding="peForceChangeCheckBox">
@@ -686,8 +686,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peForceChangeCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peForceChangeCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peForceChangeCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peForceChangeCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="9fe2f" class="javax.swing.JCheckBox" binding="peChangeImpossibleEvosCheckBox">
@@ -697,8 +697,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peChangeImpossibleEvosCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peChangeImpossibleEvosCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peChangeImpossibleEvosCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peChangeImpossibleEvosCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4ad81" class="javax.swing.JCheckBox" binding="peMakeEvolutionsEasierCheckBox">
@@ -708,8 +708,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peMakeEvolutionsEasierCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peMakeEvolutionsEasierCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peMakeEvolutionsEasierCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peMakeEvolutionsEasierCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="81bd3" class="javax.swing.JCheckBox" binding="peAllowAltFormesCheckBox">
@@ -719,8 +719,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peAllowAltFormesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peAllowAltFormesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peAllowAltFormesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peAllowAltFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b091c" class="javax.swing.JCheckBox" binding="peRemoveTimeBasedEvolutionsCheckBox">
@@ -730,8 +730,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peRemoveTimeBasedEvolutions.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peRemoveTimeBasedEvolutions.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peRemoveTimeBasedEvolutions.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peRemoveTimeBasedEvolutions.toolTipText"/>
                     </properties>
                   </component>
                   <component id="7fc31" class="javax.swing.JRadioButton" binding="peRandomEveryLevelRadioButton">
@@ -741,8 +741,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peRandomEveryLevelRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.peRandomEveryLevelRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peRandomEveryLevelRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.peRandomEveryLevelRadioButton.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -757,7 +757,7 @@
           </grid>
           <grid id="313b7" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.startersStaticsTradesPanel"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.startersStaticsTradesPanel"/>
             </constraints>
             <properties/>
             <border type="none"/>
@@ -768,7 +768,7 @@
                   <gridbag weightx="0.1" weighty="0.1"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.spPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.spPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -779,8 +779,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="8b022">
@@ -814,8 +814,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spCustomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spCustomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spCustomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spCustomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="c1c80" class="javax.swing.JRadioButton" binding="spRandomCompletelyRadioButton" default-binding="true">
@@ -825,8 +825,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spRandomCompletelyRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spRandomCompletelyRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spRandomCompletelyRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spRandomCompletelyRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="12184" class="javax.swing.JRadioButton" binding="spRandomTwoEvosRadioButton">
@@ -836,8 +836,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spRandomTwoEvosRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spRandomTwoEvosRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spRandomTwoEvosRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spRandomTwoEvosRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="83a64" class="javax.swing.JComboBox" binding="spComboBox1">
@@ -883,8 +883,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spRandomizeStarterHeldItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spRandomizeStarterHeldItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spRandomizeStarterHeldItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spRandomizeStarterHeldItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="a1ea2" class="javax.swing.JCheckBox" binding="spBanBadItemsCheckBox" default-binding="true">
@@ -894,8 +894,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spBanBadItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spBanBadItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spBanBadItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spBanBadItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="cad77" class="javax.swing.JCheckBox" binding="spAllowAltFormesCheckBox">
@@ -905,8 +905,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spAllowAltFormesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.spAllowAltFormesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spAllowAltFormesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.spAllowAltFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -941,7 +941,7 @@
                   <gridbag weightx="0.0" weighty="0.1"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.stpPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.stpPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -952,8 +952,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="c4003">
@@ -987,8 +987,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpSwapLegendariesSwapStandardsRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpSwapLegendariesSwapStandardsRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpSwapLegendariesSwapStandardsRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpSwapLegendariesSwapStandardsRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="17456" class="javax.swing.JRadioButton" binding="stpRandomCompletelyRadioButton" default-binding="true">
@@ -998,8 +998,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpRandomCompletelyRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpRandomCompletelyRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpRandomCompletelyRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpRandomCompletelyRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="282a5" class="javax.swing.JRadioButton" binding="stpRandomSimilarStrengthRadioButton">
@@ -1009,8 +1009,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpRandomSimilarStrengthRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpRandomSimilarStrengthRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpRandomSimilarStrengthRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpRandomSimilarStrengthRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="c441c" class="javax.swing.JCheckBox" binding="stpSwapMegaEvosCheckBox">
@@ -1020,8 +1020,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpSwapMegaEvosCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpSwapMegaEvosCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpSwapMegaEvosCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpSwapMegaEvosCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="84b86" class="javax.swing.JCheckBox" binding="stpPercentageLevelModifierCheckBox">
@@ -1031,8 +1031,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpPercentageLevelModifierCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpPercentageLevelModifierCheckBox.tooltipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpPercentageLevelModifierCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpPercentageLevelModifierCheckBox.tooltipText"/>
                     </properties>
                   </component>
                   <component id="f3518" class="javax.swing.JSlider" binding="stpPercentageLevelModifierSlider">
@@ -1059,8 +1059,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpRandomize600BSTCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpRandomize600BSTCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpRandomize600BSTCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpRandomize600BSTCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="69057" class="javax.swing.JCheckBox" binding="stpAllowAltFormesCheckBox">
@@ -1070,8 +1070,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpAllowAltFormesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpAllowAltFormesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpAllowAltFormesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpAllowAltFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="cde9e" class="javax.swing.JCheckBox" binding="stpLimitMainGameLegendariesCheckBox">
@@ -1081,8 +1081,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpLimitMainGameLegendariesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpLimitMainGameLegendariesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpLimitMainGameLegendariesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpLimitMainGameLegendariesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4f53f" class="javax.swing.JCheckBox" binding="stpFixMusicCheckBox">
@@ -1092,8 +1092,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpFixMusicAllCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.stpFixMusicAllCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpFixMusicAllCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.stpFixMusicAllCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -1104,7 +1104,7 @@
                   <gridbag weightx="0.0" weighty="0.1"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.igtPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.igtPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -1115,8 +1115,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="40623">
@@ -1138,8 +1138,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeGivenPokemonOnlyRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeGivenPokemonOnlyRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeGivenPokemonOnlyRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeGivenPokemonOnlyRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="f6c7b" class="javax.swing.JRadioButton" binding="igtRandomizeBothRequestedGivenRadioButton">
@@ -1149,8 +1149,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeBothRequestedGivenRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeBothRequestedGivenRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeBothRequestedGivenRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeBothRequestedGivenRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="963c8">
@@ -1172,8 +1172,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeNicknamesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeNicknamesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeNicknamesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeNicknamesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="719e9" class="javax.swing.JCheckBox" binding="igtRandomizeOTsCheckBox">
@@ -1183,8 +1183,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeOTsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeOTsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeOTsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeOTsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="e1478" class="javax.swing.JCheckBox" binding="igtRandomizeIVsCheckBox">
@@ -1194,8 +1194,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeIVsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeIVsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeIVsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeIVsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="2d4fb" class="javax.swing.JCheckBox" binding="igtRandomizeItemsCheckBox">
@@ -1205,8 +1205,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.igtRandomizeItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.igtRandomizeItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -1215,7 +1215,7 @@
           </grid>
           <grid id="f599e" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.movesMovesetsPanel"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.movesMovesetsPanel"/>
             </constraints>
             <properties/>
             <border type="none"/>
@@ -1226,7 +1226,7 @@
                   <gridbag weightx="0.1" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.mdPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.mdPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -1237,8 +1237,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePowerCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePowerCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePowerCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePowerCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="bd712">
@@ -1272,8 +1272,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveAccuracyCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveAccuracyCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveAccuracyCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveAccuracyCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="5af2e" class="javax.swing.JCheckBox" binding="mdRandomizeMovePPCheckBox">
@@ -1283,8 +1283,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePPCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePPCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePPCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMovePPCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="e9417" class="javax.swing.JCheckBox" binding="mdRandomizeMoveTypesCheckBox">
@@ -1294,8 +1294,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveTypesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveTypesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveTypesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveTypesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="7dbd0" class="javax.swing.JCheckBox" binding="mdRandomizeMoveCategoryCheckBox">
@@ -1305,8 +1305,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveCategoryCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveCategoryCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveCategoryCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdRandomizeMoveCategoryCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="5eccc" class="javax.swing.JCheckBox" binding="mdUpdateMovesCheckBox">
@@ -1316,8 +1316,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdUpdateMovesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mdUpdateMovesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdUpdateMovesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mdUpdateMovesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="19338" class="javax.swing.JComboBox" binding="mdUpdateComboBox">
@@ -1364,7 +1364,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.pmsPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.pmsPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -1375,8 +1375,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="5551e">
@@ -1410,8 +1410,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsRandomPreferringSameTypeRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsRandomPreferringSameTypeRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsRandomPreferringSameTypeRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsRandomPreferringSameTypeRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="c1370" class="javax.swing.JRadioButton" binding="pmsRandomCompletelyRadioButton">
@@ -1421,8 +1421,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsRandomCompletelyRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsRandomCompletelyRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsRandomCompletelyRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsRandomCompletelyRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="bc810" class="javax.swing.JRadioButton" binding="pmsMetronomeOnlyModeRadioButton">
@@ -1432,8 +1432,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsMetronomeOnlyModeRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsMetronomeOnlyModeRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsMetronomeOnlyModeRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsMetronomeOnlyModeRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="d836e" class="javax.swing.JCheckBox" binding="pmsGuaranteedLevel1MovesCheckBox">
@@ -1443,8 +1443,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsGuaranteedLevel1MovesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsGuaranteedLevel1MovesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsGuaranteedLevel1MovesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsGuaranteedLevel1MovesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="c408b" class="javax.swing.JCheckBox" binding="pmsReorderDamagingMovesCheckBox">
@@ -1454,8 +1454,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsReorderDamagingMovesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsReorderDamagingMovesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsReorderDamagingMovesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsReorderDamagingMovesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="ee040" class="javax.swing.JCheckBox" binding="pmsNoGameBreakingMovesCheckBox">
@@ -1465,8 +1465,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsNoGameBreakingMovesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsNoGameBreakingMovesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsNoGameBreakingMovesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsNoGameBreakingMovesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="aba8f" class="javax.swing.JCheckBox" binding="pmsForceGoodDamagingCheckBox" default-binding="true">
@@ -1476,8 +1476,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsForceGoodDamagingCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsForceGoodDamagingCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsForceGoodDamagingCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsForceGoodDamagingCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="451d5" class="javax.swing.JSlider" binding="pmsGuaranteedLevel1MovesSlider">
@@ -1493,7 +1493,7 @@
                       <paintLabels value="true"/>
                       <paintTicks value="false"/>
                       <snapToTicks value="true"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsGuaranteedLevel1MovesSlider.toolTipText"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsGuaranteedLevel1MovesSlider.toolTipText"/>
                       <value value="2"/>
                       <valueIsAdjusting value="false"/>
                     </properties>
@@ -1510,7 +1510,7 @@
                       <paintLabels value="true"/>
                       <paintTicks value="true"/>
                       <snapToTicks value="true"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsForceGoodDamagingSlider.toolTipText"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsForceGoodDamagingSlider.toolTipText"/>
                       <value value="0"/>
                     </properties>
                   </component>
@@ -1521,8 +1521,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsEvolutionMovesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.pmsEvolutionMovesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsEvolutionMovesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.pmsEvolutionMovesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -1531,7 +1531,7 @@
           </grid>
           <grid id="c4c9e" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.foePokemonPanel.title"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.foePokemonPanel.title"/>
             </constraints>
             <properties/>
             <border type="none"/>
@@ -1542,7 +1542,7 @@
                   <gridbag weightx="0.1" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.tpPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.tpPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -1565,8 +1565,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRivalCarriesStarterCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRivalCarriesStarterCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRivalCarriesStarterCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRivalCarriesStarterCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="22cfb" class="javax.swing.JCheckBox" binding="tpSimilarStrengthCheckBox">
@@ -1576,8 +1576,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpSimilarStrengthCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpSimilarStrengthCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpSimilarStrengthCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpSimilarStrengthCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="e225c" class="javax.swing.JCheckBox" binding="tpRandomizeTrainerNamesCheckBox">
@@ -1587,8 +1587,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerNamesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerNamesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerNamesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerNamesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="16a2b" class="javax.swing.JCheckBox" binding="tpRandomizeTrainerClassNamesCheckBox">
@@ -1598,8 +1598,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerClassNamesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerClassNamesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerClassNamesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRandomizeTrainerClassNamesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="d6ea3" class="javax.swing.JCheckBox" binding="tpForceFullyEvolvedAtCheckBox">
@@ -1609,8 +1609,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpForceFullyEvolvedAtCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpForceFullyEvolvedAtCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpForceFullyEvolvedAtCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpForceFullyEvolvedAtCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="63823" class="javax.swing.JSlider" binding="tpForceFullyEvolvedAtSlider">
@@ -1627,7 +1627,7 @@
                       <paintLabels value="true"/>
                       <paintTicks value="true"/>
                       <snapToTicks value="true"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpForceFullyEvolvedAtSlider.toolTipText"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpForceFullyEvolvedAtSlider.toolTipText"/>
                       <value value="30"/>
                     </properties>
                   </component>
@@ -1645,7 +1645,7 @@
                       <paintLabels value="true"/>
                       <paintTicks value="true"/>
                       <snapToTicks value="true"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpPercentageLevelModifierSlider.toolTipText"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpPercentageLevelModifierSlider.toolTipText"/>
                       <value value="0"/>
                     </properties>
                   </component>
@@ -1656,8 +1656,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpPercentageLevelModifierCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpPercentageLevelModifierCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpPercentageLevelModifierCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpPercentageLevelModifierCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="41124">
@@ -1673,8 +1673,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpWeightTypesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpWeightTypesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpWeightTypesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpWeightTypesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="acf1a" class="javax.swing.JCheckBox" binding="tpDontUseLegendariesCheckBox" default-binding="true">
@@ -1684,7 +1684,7 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpDontUseLegendariesCheckBox.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpDontUseLegendariesCheckBox.text"/>
                     </properties>
                   </component>
                   <component id="d0471" class="javax.swing.JCheckBox" binding="tpNoEarlyWonderGuardCheckBox">
@@ -1694,8 +1694,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpNoEarlyWonderGuardCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpNoEarlyWonderGuardCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpNoEarlyWonderGuardCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpNoEarlyWonderGuardCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="be65d" class="javax.swing.JCheckBox" binding="tpAllowAlternateFormesCheckBox">
@@ -1705,8 +1705,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpAllowAlternateFormesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpAllowAlternateFormesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpAllowAlternateFormesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpAllowAlternateFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="af4d1" class="javax.swing.JCheckBox" binding="tpSwapMegaEvosCheckBox">
@@ -1716,8 +1716,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpSwapMegaEvosCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpSwapMegaEvosCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpSwapMegaEvosCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpSwapMegaEvosCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="34a10" class="javax.swing.JCheckBox" binding="tpRandomShinyTrainerPokemonCheckBox">
@@ -1727,8 +1727,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRandomShinyTrainerPokemonCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRandomShinyTrainerPokemonCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRandomShinyTrainerPokemonCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRandomShinyTrainerPokemonCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <vspacer id="2342a">
@@ -1744,8 +1744,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpEliteFourUniquePokemonCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpEliteFourUniquePokemonCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpEliteFourUniquePokemonCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpEliteFourUniquePokemonCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="727d5" class="javax.swing.JSpinner" binding="tpEliteFourUniquePokemonSpinner">
@@ -1776,8 +1776,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpDoubleBattleModeCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpDoubleBattleModeCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpDoubleBattleModeCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpDoubleBattleModeCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b62cd" class="javax.swing.JLabel" binding="tpAdditionalPokemonForLabel">
@@ -1786,7 +1786,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpAddMorePokemonForLabel.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpAddMorePokemonForLabel.text"/>
                     </properties>
                   </component>
                   <component id="8f956" class="javax.swing.JCheckBox" binding="tpBossTrainersCheckBox">
@@ -1796,8 +1796,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="6d5aa" class="javax.swing.JCheckBox" binding="tpImportantTrainersCheckBox">
@@ -1807,8 +1807,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="39903" class="javax.swing.JCheckBox" binding="tpRegularTrainersCheckBox">
@@ -1818,8 +1818,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="181e" class="javax.swing.JSpinner" binding="tpBossTrainersSpinner">
@@ -1855,7 +1855,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpHeldItemsLabel.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpHeldItemsLabel.text"/>
                     </properties>
                   </component>
                   <component id="dad16" class="javax.swing.JCheckBox" binding="tpBossTrainersItemsCheckBox">
@@ -1865,8 +1865,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpBossTrainersItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="d7d93" class="javax.swing.JCheckBox" binding="tpImportantTrainersItemsCheckBox">
@@ -1876,8 +1876,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpImportantTrainersItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="7fddd" class="javax.swing.JCheckBox" binding="tpRegularTrainersItemsCheckBox">
@@ -1887,8 +1887,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpRegularTrainersItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="31e9a" class="javax.swing.JCheckBox" binding="tpConsumableItemsOnlyCheckBox">
@@ -1898,8 +1898,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpConsumableItemsOnlyCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpConsumableItemsOnlyCheckBox.tooltip"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpConsumableItemsOnlyCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpConsumableItemsOnlyCheckBox.tooltip"/>
                     </properties>
                   </component>
                   <component id="79d6a" class="javax.swing.JCheckBox" binding="tpSensibleItemsCheckBox">
@@ -1909,8 +1909,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpSensibleItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpSensibleItemsCheckBox.tooltip"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpSensibleItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpSensibleItemsCheckBox.tooltip"/>
                     </properties>
                   </component>
                   <component id="f3c52" class="javax.swing.JCheckBox" binding="tpHighestLevelGetsItemCheckBox">
@@ -1920,8 +1920,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpHighestLevelGetsItemCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpHighestLevelGetsItemCheckBox.tooltip"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpHighestLevelGetsItemCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpHighestLevelGetsItemCheckBox.tooltip"/>
                     </properties>
                   </component>
                   <component id="21090" class="javax.swing.JCheckBox" binding="tpBetterMovesetsCheckBox">
@@ -1931,8 +1931,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpBetterMovesetsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpBetterMovesetsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpBetterMovesetsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tpBetterMovesetsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -1967,7 +1967,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.totpPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.totpPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -1978,8 +1978,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="d7892">
@@ -2012,7 +2012,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.totpAllyPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.totpAllyPanel.title"/>
                     <children>
                       <component id="315a6" class="javax.swing.JRadioButton" binding="totpAllyUnchangedRadioButton">
                         <constraints>
@@ -2021,8 +2021,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllyUnchangedRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllyUnchangedRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllyUnchangedRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllyUnchangedRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="68af" class="javax.swing.JRadioButton" binding="totpAllyRandomRadioButton">
@@ -2032,8 +2032,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="3b30" class="javax.swing.JRadioButton" binding="totpAllyRandomSimilarStrengthRadioButton">
@@ -2043,8 +2043,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomSimilarStrengthRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomSimilarStrengthRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomSimilarStrengthRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllyRandomSimilarStrengthRadioButton.toolTipText"/>
                         </properties>
                       </component>
                     </children>
@@ -2055,7 +2055,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.totpAuraPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.totpAuraPanel.title"/>
                     <children>
                       <component id="f6c3b" class="javax.swing.JRadioButton" binding="totpAuraUnchangedRadioButton">
                         <constraints>
@@ -2064,8 +2064,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAuraUnchangedRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAuraUnchangedRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAuraUnchangedRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAuraUnchangedRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="b512" class="javax.swing.JRadioButton" binding="totpAuraRandomRadioButton">
@@ -2075,8 +2075,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomRadioButton.toolTipText."/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomRadioButton.toolTipText."/>
                         </properties>
                       </component>
                       <component id="d3f0a" class="javax.swing.JRadioButton" binding="totpAuraRandomSameStrengthRadioButton">
@@ -2086,8 +2086,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomSameStrengthRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomSameStrengthRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomSameStrengthRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAuraRandomSameStrengthRadioButton.toolTipText"/>
                         </properties>
                       </component>
                     </children>
@@ -2116,8 +2116,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpPercentageLevelModifierCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpPercentageLevelModifierCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpPercentageLevelModifierCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpPercentageLevelModifierCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="94ffc" class="javax.swing.JCheckBox" binding="totpRandomizeHeldItemsCheckBox">
@@ -2127,8 +2127,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpRandomizeHeldItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpRandomizeHeldItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpRandomizeHeldItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpRandomizeHeldItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="555b9" class="javax.swing.JCheckBox" binding="totpAllowAltFormesCheckBox">
@@ -2138,8 +2138,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllowAltFormesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpAllowAltFormesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllowAltFormesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpAllowAltFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="ddde3" class="javax.swing.JRadioButton" binding="totpRandomRadioButton">
@@ -2149,8 +2149,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="148f2" class="javax.swing.JRadioButton" binding="totpRandomSimilarStrengthRadioButton">
@@ -2160,8 +2160,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpRandomSimilarStrengthRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.totpRandomSimilarStrengthRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpRandomSimilarStrengthRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.totpRandomSimilarStrengthRadioButton.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -2170,7 +2170,7 @@
           </grid>
           <grid id="59ef3" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.wildPokemonPanel.title"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.wildPokemonPanel.title"/>
             </constraints>
             <properties>
               <enabled value="false"/>
@@ -2183,7 +2183,7 @@
                   <gridbag weightx="0.1" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.wpPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.wpPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -2194,8 +2194,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="45277">
@@ -2229,8 +2229,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4abec" class="javax.swing.JRadioButton" binding="wpArea1To1RadioButton">
@@ -2240,8 +2240,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpArea1To1RadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpArea1To1RadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpArea1To1RadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpArea1To1RadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="44917" class="javax.swing.JRadioButton" binding="wpGlobal1To1RadioButton">
@@ -2251,8 +2251,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpGlobal1To1RadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpGlobal1To1RadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpGlobal1To1RadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpGlobal1To1RadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <grid id="ff19e" layout-manager="GridBagLayout">
@@ -2261,7 +2261,7 @@
                       <gridbag top="0" left="0" bottom="0" right="80" weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.wpARPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.wpARPanel.title"/>
                     <children>
                       <component id="6fd8b" class="javax.swing.JRadioButton" binding="wpARNoneRadioButton">
                         <constraints>
@@ -2270,8 +2270,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARNoneRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARNoneRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARNoneRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARNoneRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <hspacer id="cc8ed">
@@ -2299,8 +2299,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARSimilarStrengthRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARSimilarStrengthRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARSimilarStrengthRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARSimilarStrengthRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="f3f94" class="javax.swing.JRadioButton" binding="wpARCatchEmAllModeRadioButton">
@@ -2310,8 +2310,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARCatchEmAllModeRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARCatchEmAllModeRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARCatchEmAllModeRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARCatchEmAllModeRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="bc941" class="javax.swing.JRadioButton" binding="wpARTypeThemeAreasRadioButton">
@@ -2321,8 +2321,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARTypeThemeAreasRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpARTypeThemeAreasRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARTypeThemeAreasRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpARTypeThemeAreasRadioButton.toolTipText"/>
                         </properties>
                       </component>
                     </children>
@@ -2334,8 +2334,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpUseTimeBasedEncountersCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpUseTimeBasedEncountersCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpUseTimeBasedEncountersCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpUseTimeBasedEncountersCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="31e5d" class="javax.swing.JCheckBox" binding="wpDontUseLegendariesCheckBox" default-binding="true">
@@ -2345,7 +2345,7 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpDontUseLegendariesCheckBox.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpDontUseLegendariesCheckBox.text"/>
                     </properties>
                   </component>
                   <component id="daaf0" class="javax.swing.JCheckBox" binding="wpSetMinimumCatchRateCheckBox">
@@ -2355,8 +2355,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpSetMinimumCatchRateCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpSetMinimumCatchRateCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpSetMinimumCatchRateCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpSetMinimumCatchRateCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b72b8" class="javax.swing.JCheckBox" binding="wpRandomizeHeldItemsCheckBox">
@@ -2366,8 +2366,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpRandomizeHeldItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpRandomizeHeldItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpRandomizeHeldItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpRandomizeHeldItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="7e552" class="javax.swing.JCheckBox" binding="wpBanBadItemsCheckBox" default-binding="true">
@@ -2377,8 +2377,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpBanBadItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpBanBadItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpBanBadItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpBanBadItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="da56d" class="javax.swing.JCheckBox" binding="wpBalanceShakingGrassPokemonCheckBox">
@@ -2388,8 +2388,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpBalanceShakingGrassPokemonCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpBalanceShakingGrassPokemonCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpBalanceShakingGrassPokemonCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpBalanceShakingGrassPokemonCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="a5c09" class="javax.swing.JCheckBox" binding="wpPercentageLevelModifierCheckBox" default-binding="true">
@@ -2399,8 +2399,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpPercentageLevelModifierCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpPercentageLevelModifierCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpPercentageLevelModifierCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpPercentageLevelModifierCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="7e56b" class="javax.swing.JSlider" binding="wpPercentageLevelModifierSlider" default-binding="true">
@@ -2417,7 +2417,7 @@
                       <paintLabels value="true"/>
                       <paintTicks value="true"/>
                       <snapToTicks value="true"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpPercentageLevelModifierSlider.toolTipText"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpPercentageLevelModifierSlider.toolTipText"/>
                       <value value="0"/>
                     </properties>
                   </component>
@@ -2433,7 +2433,7 @@
                       <minimum value="1"/>
                       <paintLabels value="true"/>
                       <snapToTicks value="true"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpSetMinimumCatchRateSlider.toolTipText"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpSetMinimumCatchRateSlider.toolTipText"/>
                       <value value="1"/>
                     </properties>
                   </component>
@@ -2444,8 +2444,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpAllowAltFormesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.wpAllowAltFormesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpAllowAltFormesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.wpAllowAltFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -2478,7 +2478,7 @@
           </grid>
           <grid id="c0784" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.tmsHMsTutorsPanel.title"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.tmsHMsTutorsPanel.title"/>
             </constraints>
             <properties>
               <enabled value="false"/>
@@ -2491,7 +2491,7 @@
                   <gridbag weightx="0.1" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.tmPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.tmPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -2501,7 +2501,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.tmMovesPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.tmMovesPanel.title"/>
                     <children>
                       <component id="77153" class="javax.swing.JRadioButton" binding="tmUnchangedRadioButton" default-binding="true">
                         <constraints>
@@ -2510,8 +2510,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmUnchangedRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmUnchangedRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmUnchangedRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmUnchangedRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <vspacer id="c775">
@@ -2539,8 +2539,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmRandomRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmRandomRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmRandomRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmRandomRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="e94bb" class="javax.swing.JCheckBox" binding="tmNoGameBreakingMovesCheckBox">
@@ -2550,8 +2550,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmNoGameBreakingMovesCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmNoGameBreakingMovesCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmNoGameBreakingMovesCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmNoGameBreakingMovesCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="e66ed" class="javax.swing.JCheckBox" binding="tmKeepFieldMoveTMsCheckBox">
@@ -2561,8 +2561,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmKeepFieldMoveTMsCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmKeepFieldMoveTMsCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmKeepFieldMoveTMsCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmKeepFieldMoveTMsCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="39544" class="javax.swing.JCheckBox" binding="tmForceGoodDamagingCheckBox" default-binding="true">
@@ -2572,8 +2572,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmForceGoodDamagingCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmForceGoodDamagingCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmForceGoodDamagingCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmForceGoodDamagingCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="60c91" class="javax.swing.JSlider" binding="tmForceGoodDamagingSlider" default-binding="true">
@@ -2588,7 +2588,7 @@
                           <paintLabels value="true"/>
                           <paintTicks value="true"/>
                           <snapToTicks value="true"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmForceGoodDamagingSlider.toolTipText"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmForceGoodDamagingSlider.toolTipText"/>
                           <value value="0"/>
                         </properties>
                       </component>
@@ -2624,7 +2624,7 @@
                       <gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.thcPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.thcPanel.title"/>
                     <children>
                       <component id="eb901" class="javax.swing.JRadioButton" binding="thcUnchangedRadioButton" default-binding="true">
                         <constraints>
@@ -2633,8 +2633,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcUnchangedRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcUnchangedRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcUnchangedRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcUnchangedRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <vspacer id="f28aa">
@@ -2662,8 +2662,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcRandomPreferSameTypeRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcRandomPreferSameTypeRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcRandomPreferSameTypeRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcRandomPreferSameTypeRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="bdcf8" class="javax.swing.JRadioButton" binding="thcRandomCompletelyRadioButton">
@@ -2673,8 +2673,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcRandomCompletelyRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcRandomCompletelyRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcRandomCompletelyRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcRandomCompletelyRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="1bb6c" class="javax.swing.JRadioButton" binding="thcFullCompatibilityRadioButton" default-binding="true">
@@ -2684,8 +2684,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcFullCompatibilityRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.thcFullCompatibilityRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcFullCompatibilityRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.thcFullCompatibilityRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="65e15" class="javax.swing.JCheckBox" binding="tmFollowEvolutionsCheckBox">
@@ -2695,8 +2695,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmFollowEvolutionsCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmFollowEvolutionsCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmFollowEvolutionsCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmFollowEvolutionsCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="7ba73" class="javax.swing.JCheckBox" binding="tmLevelupMoveSanityCheckBox" default-binding="true">
@@ -2706,8 +2706,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmLevelupMoveSanityCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmLevelupMoveSanityCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmLevelupMoveSanityCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmLevelupMoveSanityCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="b7d85" class="javax.swing.JCheckBox" binding="tmFullHMCompatibilityCheckBox">
@@ -2717,8 +2717,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmFullHMCompatibilityCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tmFullHMCompatibilityCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmFullHMCompatibilityCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.tmFullHMCompatibilityCheckBox.toolTipText"/>
                         </properties>
                       </component>
                     </children>
@@ -2755,7 +2755,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.mtPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.mtPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -2765,7 +2765,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.mtMovesPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.mtMovesPanel.title"/>
                     <children>
                       <component id="c71e0" class="javax.swing.JRadioButton" binding="mtUnchangedRadioButton" default-binding="true">
                         <constraints>
@@ -2774,8 +2774,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtUnchangedRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtUnchangedRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtUnchangedRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtUnchangedRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <vspacer id="e8b9">
@@ -2803,8 +2803,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtRandomRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtRandomRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtRandomRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtRandomRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="108c3" class="javax.swing.JSlider" binding="mtForceGoodDamagingSlider">
@@ -2819,7 +2819,7 @@
                           <paintLabels value="true"/>
                           <paintTicks value="true"/>
                           <snapToTicks value="true"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtForceGoodDamagingSlider.toolTipText"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtForceGoodDamagingSlider.toolTipText"/>
                           <value value="0"/>
                         </properties>
                       </component>
@@ -2830,8 +2830,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtNoGameBreakingMovesCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtNoGameBreakingMovesCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtNoGameBreakingMovesCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtNoGameBreakingMovesCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="d8aa" class="javax.swing.JCheckBox" binding="mtKeepFieldMoveTutorsCheckBox">
@@ -2841,8 +2841,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtKeepFieldMoveTutorsCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtKeepFieldMoveTutorsCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtKeepFieldMoveTutorsCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtKeepFieldMoveTutorsCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="5a253" class="javax.swing.JCheckBox" binding="mtForceGoodDamagingCheckBox">
@@ -2852,8 +2852,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtForceGoodDamagingCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtForceGoodDamagingCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtForceGoodDamagingCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtForceGoodDamagingCheckBox.toolTipText"/>
                         </properties>
                       </component>
                     </children>
@@ -2888,7 +2888,7 @@
                       <gridbag top="0" left="20" bottom="0" right="0" weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties/>
-                    <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.mtcPanel.title"/>
+                    <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.mtcPanel.title"/>
                     <children>
                       <component id="909ae" class="javax.swing.JRadioButton" binding="mtcUnchangedRadioButton" default-binding="true">
                         <constraints>
@@ -2897,8 +2897,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcUnchangedRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcUnchangedRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcUnchangedRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcUnchangedRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <vspacer id="993c4">
@@ -2926,8 +2926,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcRandomPreferSameTypeRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcRandomPreferSameTypeRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcRandomPreferSameTypeRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcRandomPreferSameTypeRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="e0f5e" class="javax.swing.JRadioButton" binding="mtcRandomCompletelyRadioButton">
@@ -2937,8 +2937,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcRandomCompletelyRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcRandomCompletelyRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcRandomCompletelyRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcRandomCompletelyRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="6ffa1" class="javax.swing.JRadioButton" binding="mtcFullCompatibilityRadioButton" default-binding="true">
@@ -2948,8 +2948,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcFullCompatibilityRadioButton.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtcFullCompatibilityRadioButton.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcFullCompatibilityRadioButton.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtcFullCompatibilityRadioButton.toolTipText"/>
                         </properties>
                       </component>
                       <component id="e4773" class="javax.swing.JCheckBox" binding="mtFollowEvolutionsCheckBox">
@@ -2959,8 +2959,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtFollowEvolutionsCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtFollowEvolutionsCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtFollowEvolutionsCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtFollowEvolutionsCheckBox.toolTipText"/>
                         </properties>
                       </component>
                       <component id="801a1" class="javax.swing.JCheckBox" binding="mtLevelupMoveSanityCheckBox">
@@ -2970,8 +2970,8 @@
                         </constraints>
                         <properties>
                           <enabled value="false"/>
-                          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtLevelupMoveSanityCheckBox.text"/>
-                          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtLevelupMoveSanityCheckBox.toolTipText"/>
+                          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtLevelupMoveSanityCheckBox.text"/>
+                          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtLevelupMoveSanityCheckBox.toolTipText"/>
                         </properties>
                       </component>
                     </children>
@@ -2983,7 +2983,7 @@
                     </constraints>
                     <properties>
                       <enabled value="true"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.mtNoExistLabel.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.mtNoExistLabel.text"/>
                     </properties>
                   </component>
                 </children>
@@ -2992,7 +2992,7 @@
           </grid>
           <grid id="42a4d" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.itemsPanel.title"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.itemsPanel.title"/>
             </constraints>
             <properties>
               <enabled value="false"/>
@@ -3005,7 +3005,7 @@
                   <gridbag weightx="0.1" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.fiPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.fiPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -3016,8 +3016,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="365a6">
@@ -3051,8 +3051,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiShuffleRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiShuffleRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiShuffleRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiShuffleRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="74283" class="javax.swing.JRadioButton" binding="fiRandomRadioButton" default-binding="true">
@@ -3062,8 +3062,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b0d01" class="javax.swing.JRadioButton" binding="fiRandomEvenDistributionRadioButton" default-binding="true">
@@ -3073,8 +3073,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiRandomEvenDistributionRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiRandomEvenDistributionRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiRandomEvenDistributionRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiRandomEvenDistributionRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="d9fbb" class="javax.swing.JCheckBox" binding="fiBanBadItemsCheckBox" default-binding="true">
@@ -3084,8 +3084,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiBanBadItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.fiBanBadItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiBanBadItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.fiBanBadItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -3120,7 +3120,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.shPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.shPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -3131,8 +3131,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="ffc84">
@@ -3166,8 +3166,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shShuffleRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shShuffleRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shShuffleRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shShuffleRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="4324" class="javax.swing.JRadioButton" binding="shRandomRadioButton" default-binding="true">
@@ -3177,8 +3177,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="2d537" class="javax.swing.JCheckBox" binding="shBanOverpoweredShopItemsCheckBox">
@@ -3188,8 +3188,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBanOverpoweredShopItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBanOverpoweredShopItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBanOverpoweredShopItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBanOverpoweredShopItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="c8590" class="javax.swing.JCheckBox" binding="shBanBadItemsCheckBox" default-binding="true">
@@ -3199,8 +3199,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBanBadItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBanBadItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBanBadItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBanBadItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="65395" class="javax.swing.JCheckBox" binding="shBanRegularShopItemsCheckBox">
@@ -3210,8 +3210,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBanRegularShopItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBanRegularShopItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBanRegularShopItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBanRegularShopItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="9e484" class="javax.swing.JCheckBox" binding="shBalanceShopItemPricesCheckBox">
@@ -3221,8 +3221,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBalanceShopItemPricesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shBalanceShopItemPricesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBalanceShopItemPricesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shBalanceShopItemPricesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="5bba5" class="javax.swing.JCheckBox" binding="shGuaranteeEvolutionItemsCheckBox">
@@ -3232,8 +3232,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shGuaranteeEvolutionItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shGuaranteeEvolutionItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shGuaranteeEvolutionItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shGuaranteeEvolutionItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="f7f02" class="javax.swing.JCheckBox" binding="shGuaranteeXItemsCheckBox">
@@ -3244,8 +3244,8 @@
                     <properties>
                       <enabled value="false"/>
                       <selected value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shGuaranteeXItemsCheckbox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.shGuaranteeXItemsCheckbox.tooltipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shGuaranteeXItemsCheckbox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.shGuaranteeXItemsCheckbox.tooltipText"/>
                     </properties>
                   </component>
                 </children>
@@ -3256,7 +3256,7 @@
                   <gridbag weightx="0.0" weighty="0.0"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.puPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.puPanel.title">
                   <font style="1"/>
                 </border>
                 <children>
@@ -3267,8 +3267,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.puUnchangedRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.puUnchangedRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.puUnchangedRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.puUnchangedRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="5bf93">
@@ -3302,8 +3302,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.puRandomRadioButton.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.puRandomRadioButton.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.puRandomRadioButton.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.puRandomRadioButton.toolTipText"/>
                     </properties>
                   </component>
                   <component id="45bbb" class="javax.swing.JCheckBox" binding="puBanBadItemsCheckBox">
@@ -3313,8 +3313,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.puBanBadItemsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.puBanBadItemsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.puBanBadItemsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.puBanBadItemsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -3323,7 +3323,7 @@
           </grid>
           <grid id="e8bbb" binding="baseTweaksPanel" layout-manager="GridBagLayout">
             <constraints>
-              <tabbedpane title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.miscTweaksPanel.title"/>
+              <tabbedpane title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.miscTweaksPanel.title"/>
             </constraints>
             <properties>
               <enabled value="false"/>
@@ -3336,7 +3336,7 @@
                   <gridbag weightx="0.1" weighty="0.1"/>
                 </constraints>
                 <properties/>
-                <border type="none" title-resource-bundle="com/sneed/pkrandom/newgui/Bundle" title-key="GUI.miscPanel.title">
+                <border type="none" title-resource-bundle="com/pkrandom/newgui/Bundle" title-key="GUI.miscPanel.title">
                   <font/>
                 </border>
                 <children>
@@ -3347,8 +3347,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscBWExpPatchCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscBWExpPatchCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscBWExpPatchCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscBWExpPatchCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <hspacer id="e97bc">
@@ -3376,8 +3376,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscNerfXAccuracyCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscNerfXAccuracyCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscNerfXAccuracyCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscNerfXAccuracyCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="39078" class="javax.swing.JCheckBox" binding="miscFixCritRateCheckBox">
@@ -3387,8 +3387,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscFixCritRateCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscFixCritRateCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscFixCritRateCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscFixCritRateCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="89b5c" class="javax.swing.JCheckBox" binding="miscFastestTextCheckBox">
@@ -3398,8 +3398,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscFastestTextCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscFastestTextCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscFastestTextCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscFastestTextCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="5c1b1" class="javax.swing.JCheckBox" binding="miscRunningShoesIndoorsCheckBox">
@@ -3409,8 +3409,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscRunningShoesIndoorsCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscRunningShoesIndoorsCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscRunningShoesIndoorsCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscRunningShoesIndoorsCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="bd6ce" class="javax.swing.JCheckBox" binding="miscRandomizePCPotionCheckBox">
@@ -3420,8 +3420,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscRandomizePCPotionCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscRandomizePCPotionCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscRandomizePCPotionCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscRandomizePCPotionCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="a174b" class="javax.swing.JCheckBox" binding="miscAllowPikachuEvolutionCheckBox">
@@ -3431,8 +3431,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscAllowPikachuEvolutionCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscAllowPikachuEvolutionCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscAllowPikachuEvolutionCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscAllowPikachuEvolutionCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="6af08" class="javax.swing.JCheckBox" binding="miscGiveNationalDexAtCheckBox">
@@ -3442,8 +3442,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscGiveNationalDexAtCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscGiveNationalDexAtCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscGiveNationalDexAtCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscGiveNationalDexAtCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="f8bbd" class="javax.swing.JCheckBox" binding="miscUpdateTypeEffectivenessCheckBox">
@@ -3453,8 +3453,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscUpdateTypeEffectivenessCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscUpdateTypeEffectivenessCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscUpdateTypeEffectivenessCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscUpdateTypeEffectivenessCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="b7d7c" class="javax.swing.JCheckBox" binding="miscLowerCasePokemonNamesCheckBox">
@@ -3464,8 +3464,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscLowerCasePokemonNamesCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscLowerCasePokemonNamesCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscLowerCasePokemonNamesCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscLowerCasePokemonNamesCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="7fe16" class="javax.swing.JCheckBox" binding="miscRandomizeCatchingTutorialCheckBox">
@@ -3475,8 +3475,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscRandomizeCatchingTutorialCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscRandomizeCatchingTutorialCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscRandomizeCatchingTutorialCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscRandomizeCatchingTutorialCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="d8e23" class="javax.swing.JCheckBox" binding="miscBanLuckyEggCheckBox">
@@ -3486,8 +3486,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscBanLuckyEggCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscBanLuckyEggCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscBanLuckyEggCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscBanLuckyEggCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="9cf5c" class="javax.swing.JCheckBox" binding="miscNoFreeLuckyEggCheckBox">
@@ -3497,8 +3497,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscNoFreeLuckyEggCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscNoFreeLuckyEggCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscNoFreeLuckyEggCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscNoFreeLuckyEggCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="68538" class="javax.swing.JCheckBox" binding="miscBanBigMoneyManiacCheckBox">
@@ -3508,8 +3508,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscBanBigMoneyManiacCheckBox.text"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscBanBigMoneyManiacCheckBox.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscBanBigMoneyManiacCheckBox.text"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscBanBigMoneyManiacCheckBox.toolTipText"/>
                     </properties>
                   </component>
                   <component id="3e84b" class="javax.swing.JLabel" binding="mtNoneAvailableLabel">
@@ -3518,7 +3518,7 @@
                       <gridbag weightx="0.0" weighty="0.0"/>
                     </constraints>
                     <properties>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.miscNoneAvailableLabel.text"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.miscNoneAvailableLabel.text"/>
                     </properties>
                   </component>
                   <component id="27c9" class="javax.swing.JCheckBox" binding="miscSOSBattlesCheckBox">
@@ -3528,8 +3528,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.sosBattles.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.sosBattles.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.sosBattles.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.sosBattles.toolTipText"/>
                     </properties>
                   </component>
                   <component id="5cd10" class="javax.swing.JCheckBox" binding="miscBalanceStaticLevelsCheckBox">
@@ -3539,8 +3539,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.balanceStaticLevels.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.balanceStaticLevels.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.balanceStaticLevels.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.balanceStaticLevels.toolTipText"/>
                     </properties>
                   </component>
                   <component id="1d98d" class="javax.swing.JCheckBox" binding="miscRetainAltFormesCheckBox">
@@ -3550,8 +3550,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.retainAltFormes.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.retainAltFormes.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.retainAltFormes.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.retainAltFormes.toolTipText"/>
                     </properties>
                   </component>
                   <component id="baacf" class="javax.swing.JCheckBox" binding="miscRunWithoutRunningShoesCheckBox">
@@ -3561,8 +3561,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.runWithoutRunningShoes.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.runWithoutRunningShoes.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.runWithoutRunningShoes.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.runWithoutRunningShoes.toolTipText"/>
                     </properties>
                   </component>
                   <component id="52a" class="javax.swing.JCheckBox" binding="miscFasterHPAndEXPBarsCheckBox">
@@ -3572,8 +3572,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.fasterHpAndExpBars.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.fasterHpAndExpBars.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.fasterHpAndExpBars.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.fasterHpAndExpBars.toolTipText"/>
                     </properties>
                   </component>
                   <component id="531ae" class="javax.swing.JCheckBox" binding="miscForceChallengeModeCheckBox">
@@ -3583,8 +3583,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.forceChallengeMode.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.forceChallengeMode.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.forceChallengeMode.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.forceChallengeMode.toolTipText"/>
                     </properties>
                   </component>
                   <component id="d472a" class="javax.swing.JCheckBox" binding="miscFastDistortionWorldCheckBox">
@@ -3594,8 +3594,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.fastDistortionWorld.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.fastDistortionWorld.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.fastDistortionWorld.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.fastDistortionWorld.toolTipText"/>
                     </properties>
                   </component>
                   <component id="720c8" class="javax.swing.JCheckBox" binding="miscUpdateRotomFormeTypingCheckBox">
@@ -3605,8 +3605,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.updateRotomFormeTyping.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.updateRotomFormeTyping.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.updateRotomFormeTyping.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.updateRotomFormeTyping.toolTipText"/>
                     </properties>
                   </component>
                   <component id="1f079" class="javax.swing.JCheckBox" binding="miscDisableLowHPMusicCheckBox">
@@ -3616,8 +3616,8 @@
                     </constraints>
                     <properties>
                       <enabled value="false"/>
-                      <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.disableLowHpMusic.name"/>
-                      <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="CodeTweaks.disableLowHpMusic.toolTipText"/>
+                      <text resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.disableLowHpMusic.name"/>
+                      <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="CodeTweaks.disableLowHpMusic.toolTipText"/>
                     </properties>
                   </component>
                 </children>
@@ -3657,7 +3657,7 @@
         </constraints>
         <properties>
           <requestFocusEnabled value="false"/>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.openROMButton.text"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.openROMButton.text"/>
         </properties>
       </component>
       <component id="60ca8" class="javax.swing.JButton" binding="randomizeSaveButton" default-binding="true">
@@ -3666,7 +3666,7 @@
           <gridbag top="0" left="0" bottom="10" right="0" weightx="0.3" weighty="0.0"/>
         </constraints>
         <properties>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.randomizeSaveButton.text"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.randomizeSaveButton.text"/>
         </properties>
       </component>
       <component id="d61b0" class="javax.swing.JButton" binding="premadeSeedButton" default-binding="true">
@@ -3675,7 +3675,7 @@
           <gridbag top="0" left="0" bottom="10" right="0" weightx="0.3" weighty="0.0"/>
         </constraints>
         <properties>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.premadeSeedButton.text"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.premadeSeedButton.text"/>
         </properties>
       </component>
       <component id="2f42" class="javax.swing.JButton" binding="settingsButton" default-binding="true">
@@ -3684,7 +3684,7 @@
           <gridbag weightx="0.3" weighty="0.0"/>
         </constraints>
         <properties>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.settingsButton.text"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.settingsButton.text"/>
         </properties>
       </component>
       <component id="df6e7" class="javax.swing.JLabel" binding="versionLabel">
@@ -3694,7 +3694,7 @@
         </constraints>
         <properties>
           <font style="1"/>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.versionLabel.text"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.versionLabel.text"/>
         </properties>
       </component>
       <hspacer id="d2a3b">
@@ -3727,7 +3727,7 @@
           <gridbag weightx="0.1" weighty="0.0"/>
         </constraints>
         <properties>
-          <icon value="com/sneed/pkrandom/newgui/emptyIcon.png"/>
+          <icon value="com/pkrandom/newgui/emptyIcon.png"/>
           <text value=""/>
         </properties>
       </component>
@@ -3738,8 +3738,8 @@
         </constraints>
         <properties>
           <enabled value="false"/>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.saveSettingsButton.text"/>
-          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.saveSettingsButton.toolTipText"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.saveSettingsButton.text"/>
+          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.saveSettingsButton.toolTipText"/>
         </properties>
       </component>
       <component id="b0dde" class="javax.swing.JButton" binding="loadSettingsButton" default-binding="true">
@@ -3749,8 +3749,8 @@
         </constraints>
         <properties>
           <enabled value="false"/>
-          <text resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.loadSettingsButton.text"/>
-          <toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.loadSettingsButton.toolTipText"/>
+          <text resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.loadSettingsButton.text"/>
+          <toolTipText resource-bundle="com/pkrandom/newgui/Bundle" key="GUI.loadSettingsButton.toolTipText"/>
         </properties>
       </component>
       <hspacer id="bd24f">
diff --git a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java b/src/com/pkrandom/newgui/NewRandomizerGUI.java
index b9effa8..e3e762e 100644
--- a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java
+++ b/src/com/pkrandom/newgui/NewRandomizerGUI.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  NewRandomizerGUI.java - the main GUI for the randomizer, containing   --*/
 /*--                          the various options available and such        --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed            --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -25,17 +24,17 @@ package com.sneed.pkrandom.newgui;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.*;
-import com.sneed.pkrandom.cli.CliRandomizer;
-import com.sneed.pkrandom.constants.GlobalConstants;
-import com.sneed.pkrandom.exceptions.CannotWriteToLocationException;
-import com.sneed.pkrandom.exceptions.EncryptedROMException;
-import com.sneed.pkrandom.exceptions.InvalidSupplementFilesException;
-import com.sneed.pkrandom.exceptions.RandomizationException;
-import com.sneed.pkrandom.pokemon.ExpCurve;
-import com.sneed.pkrandom.pokemon.GenRestrictions;
-import com.sneed.pkrandom.pokemon.Pokemon;
-import com.sneed.pkrandom.romhandlers.*;
+import com.pkrandom.*;
+import com.pkrandom.cli.CliRandomizer;
+import com.pkrandom.constants.GlobalConstants;
+import com.pkrandom.exceptions.CannotWriteToLocationException;
+import com.pkrandom.exceptions.EncryptedROMException;
+import com.pkrandom.exceptions.InvalidSupplementFilesException;
+import com.pkrandom.exceptions.RandomizationException;
+import com.pkrandom.pokemon.ExpCurve;
+import com.pkrandom.pokemon.GenRestrictions;
+import com.pkrandom.pokemon.Pokemon;
+import com.pkrandom.romhandlers.*;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
@@ -330,7 +329,7 @@ public class NewRandomizerGUI {
 	private JMenuItem loadGetSettingsMenuItem;
 	private JMenuItem keepOrUnloadGameAfterRandomizingMenuItem;
 
-	private ImageIcon emptyIcon = new ImageIcon(getClass().getResource("/com/sneed/pkrandom/newgui/emptyIcon.png"));
+	private ImageIcon emptyIcon = new ImageIcon(getClass().getResource("/com/pkrandom/newgui/emptyIcon.png"));
 	private boolean haveCheckedCustomNames, unloadGameOnSuccess;
 	private Map<String, String> gameUpdates = new TreeMap<>();
 
@@ -342,7 +341,7 @@ public class NewRandomizerGUI {
 	public NewRandomizerGUI() {
 		ToolTipManager.sharedInstance().setInitialDelay(400);
 		ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE);
-		bundle = ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle");
+		bundle = ResourceBundle.getBundle("com/pkrandom/newgui/Bundle");
 		testForRequiredConfigs();
 		checkHandlers = new RomHandler.Factory[] { new Gen1RomHandler.Factory(), new Gen2RomHandler.Factory(),
 				new Gen3RomHandler.Factory(), new Gen4RomHandler.Factory(), new Gen5RomHandler.Factory(),
diff --git a/src/com/sneed/pkrandom/newgui/OperationDialog.java b/src/com/pkrandom/newgui/OperationDialog.java
index b0289a7..0028582 100644
--- a/src/com/sneed/pkrandom/newgui/OperationDialog.java
+++ b/src/com/pkrandom/newgui/OperationDialog.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  OperationDialog.java - a dialog that displays the loading spinner     --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -24,7 +23,7 @@ package com.sneed.pkrandom.newgui;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 import javax.swing.*;
 import java.awt.*;
@@ -119,7 +118,7 @@ public class OperationDialog extends javax.swing.JDialog {
     private ImageIcon getLoadingIcon() {
         try {
             InputStream in = OperationDialog.class
-                    .getResourceAsStream("/com/sneed/pkrandom/newgui/loading.gif");
+                    .getResourceAsStream("/com/pkrandom/newgui/loading.gif");
             byte[] buf = FileFunctions.readFullyIntoBuffer(in, in.available());
             in.close();
             Image image = Toolkit.getDefaultToolkit().createImage(buf);
diff --git a/src/com/sneed/pkrandom/newgui/PresetFileFilter.java b/src/com/pkrandom/newgui/PresetFileFilter.java
index cd2d4da..14ffda0 100644
--- a/src/com/sneed/pkrandom/newgui/PresetFileFilter.java
+++ b/src/com/pkrandom/newgui/PresetFileFilter.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  PresetFileFilter.java - a file filter for the "randomization presets" --*/
@@ -10,7 +10,6 @@ package com.sneed.pkrandom.newgui;
 /*--                          on demand.                                    --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/newgui/PresetLoadDialog.java b/src/com/pkrandom/newgui/PresetLoadDialog.java
index ce1830a..4e73793 100644
--- a/src/com/sneed/pkrandom/newgui/PresetLoadDialog.java
+++ b/src/com/pkrandom/newgui/PresetLoadDialog.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  PresetLoadDialog.java - a dialog to allow use of preset files or      --*/
@@ -10,7 +10,6 @@ package com.sneed.pkrandom.newgui;
 /*--                          premade ROMs.                                 --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -30,10 +29,10 @@ package com.sneed.pkrandom.newgui;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.*;
-import com.sneed.pkrandom.exceptions.InvalidSupplementFilesException;
-import com.sneed.pkrandom.romhandlers.Abstract3DSRomHandler;
-import com.sneed.pkrandom.romhandlers.RomHandler;
+import com.pkrandom.*;
+import com.pkrandom.exceptions.InvalidSupplementFilesException;
+import com.pkrandom.romhandlers.Abstract3DSRomHandler;
+import com.pkrandom.romhandlers.RomHandler;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -67,7 +66,7 @@ public class PresetLoadDialog extends JDialog {
      */
     public PresetLoadDialog(NewRandomizerGUI parent, JFrame frame) {
         super(frame, true);
-        bundle = java.util.ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle"); // NOI18N
+        bundle = java.util.ResourceBundle.getBundle("com/pkrandom/newgui/Bundle"); // NOI18N
         initComponents();
         this.parentGUI = parent;
         this.presetFileChooser.setCurrentDirectory(new File("./"));
@@ -359,7 +358,7 @@ public class PresetLoadDialog extends JDialog {
         romFileChooser.setFileFilter(new ROMFilter());
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle"); // NOI18N
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/pkrandom/newgui/Bundle"); // NOI18N
         setTitle(bundle.getString("PresetLoadDialog.title")); // NOI18N
         setModal(true);
         setResizable(false);
diff --git a/src/com/sneed/pkrandom/newgui/PresetMakeDialog.java b/src/com/pkrandom/newgui/PresetMakeDialog.java
index 27f8850..da91e71 100644
--- a/src/com/sneed/pkrandom/newgui/PresetMakeDialog.java
+++ b/src/com/pkrandom/newgui/PresetMakeDialog.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  PresetMakeDialog.java - a dialog to allow preset pairs to either be   --*/
@@ -10,7 +10,6 @@ package com.sneed.pkrandom.newgui;
 /*--                          later use.                                    --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -30,10 +29,10 @@ package com.sneed.pkrandom.newgui;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.Settings;
-import com.sneed.pkrandom.SysConstants;
-import com.sneed.pkrandom.Version;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.Settings;
+import com.pkrandom.SysConstants;
+import com.pkrandom.Version;
 
 import javax.swing.*;
 import java.awt.event.MouseEvent;
@@ -93,7 +92,7 @@ public class PresetMakeDialog extends javax.swing.JDialog {
         presetFileChooser.setFileFilter(new PresetFileFilter());
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/sneed/pkrandom/newgui/Bundle"); // NOI18N
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("com/pkrandom/newgui/Bundle"); // NOI18N
         setTitle(bundle.getString("PresetMakeDialog.title")); // NOI18N
         setModal(true);
         setResizable(false);
diff --git a/src/com/sneed/pkrandom/newgui/QSFileFilter.java b/src/com/pkrandom/newgui/QSFileFilter.java
index 606341d..cfdb567 100644
--- a/src/com/sneed/pkrandom/newgui/QSFileFilter.java
+++ b/src/com/pkrandom/newgui/QSFileFilter.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*--  PresetFileFilter.java - a file filter for the "randomization presets" --*/
@@ -10,7 +10,6 @@ package com.sneed.pkrandom.newgui;
 /*--                          on demand.                                    --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/newgui/ROMFilter.java b/src/com/pkrandom/newgui/ROMFilter.java
index e3de25c..68f7c55 100644
--- a/src/com/sneed/pkrandom/newgui/ROMFilter.java
+++ b/src/com/pkrandom/newgui/ROMFilter.java
@@ -2,14 +2,13 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.sneed.pkrandom.newgui;
+package com.pkrandom.newgui;
 
 /*----------------------------------------------------------------------------*/
 /*-- ROMFilter.java - a file filter for the various games which can be      --*/
 /*--                  randomized with this program.                         --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/newgui/emptyIcon.png b/src/com/pkrandom/newgui/emptyIcon.png
index d21ab66..d21ab66 100644
--- a/src/com/sneed/pkrandom/newgui/emptyIcon.png
+++ b/src/com/pkrandom/newgui/emptyIcon.png
diff --git a/src/com/sneed/pkrandom/newgui/loading.gif b/src/com/pkrandom/newgui/loading.gif
index 3288d10..3288d10 100644
--- a/src/com/sneed/pkrandom/newgui/loading.gif
+++ b/src/com/pkrandom/newgui/loading.gif
diff --git a/src/com/sneed/pkrandom/newnds/CRC16.java b/src/com/pkrandom/newnds/CRC16.java
index 57c3557..8ae8ad2 100755
--- a/src/com/sneed/pkrandom/newnds/CRC16.java
+++ b/src/com/pkrandom/newnds/CRC16.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.newnds;
+package com.pkrandom.newnds;
 
 /*----------------------------------------------------------------------------*/
 /*--  CRC16.java - crc16 calculator for NDS checksums                       --*/
 /*--  Code derived from "Nintendo DS rom tool", copyright (C) DevkitPro     --*/
 /*--  Original Code by Rafael Vuijk, Dave Murphy, Alexei Karpenko           --*/
 /*--                                                                        --*/
-/*--  Ported to Java by sneed under the terms of the GPL:               --*/
 /*--                                                                        --*/
 /*--  This program is free software: you can redistribute it and/or modify  --*/
 /*--  it under the terms of the GNU General Public License as published by  --*/
diff --git a/src/com/sneed/pkrandom/newnds/NARCArchive.java b/src/com/pkrandom/newnds/NARCArchive.java
index 5376f40..dd6c239 100644
--- a/src/com/sneed/pkrandom/newnds/NARCArchive.java
+++ b/src/com/pkrandom/newnds/NARCArchive.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.newnds;
+package com.pkrandom.newnds;
 
 /*----------------------------------------------------------------------------*/
 /*--  NARCArchive.java - class for packing/unpacking GARC archives          --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/newnds/NDSFile.java b/src/com/pkrandom/newnds/NDSFile.java
index 9164dc1..c3564f2 100755
--- a/src/com/sneed/pkrandom/newnds/NDSFile.java
+++ b/src/com/pkrandom/newnds/NDSFile.java
@@ -1,18 +1,17 @@
-package com.sneed.pkrandom.newnds;
+package com.pkrandom.newnds;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 /*----------------------------------------------------------------------------*/
 /*--  NDSFile.java - an entry in the FAT/FNT filesystem                     --*/
 /*--  Code based on "Nintendo DS rom tool", copyright (C) DevkitPro         --*/
 /*--  Original Code by Rafael Vuijk, Dave Murphy, Alexei Karpenko           --*/
 /*--                                                                        --*/
-/*--  Ported to Java by sneed under the terms of the GPL:               --*/
 /*--                                                                        --*/
 /*--  This program is free software: you can redistribute it and/or modify  --*/
 /*--  it under the terms of the GNU General Public License as published by  --*/
diff --git a/src/com/sneed/pkrandom/newnds/NDSRom.java b/src/com/pkrandom/newnds/NDSRom.java
index 61e6dee..fee90a1 100755
--- a/src/com/sneed/pkrandom/newnds/NDSRom.java
+++ b/src/com/pkrandom/newnds/NDSRom.java
@@ -1,16 +1,16 @@
-package com.sneed.pkrandom.newnds;
+package com.pkrandom.newnds;
 
 import java.io.*;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 
-import com.sneed.pkrandom.SysConstants;
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.RomFunctions;
+import com.pkrandom.SysConstants;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.RomFunctions;
 
-import com.sneed.pkrandom.exceptions.CannotWriteToLocationException;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.exceptions.CannotWriteToLocationException;
+import com.pkrandom.exceptions.RandomizerIOException;
 import cuecompressors.BLZCoder;
 
 /*----------------------------------------------------------------------------*/
@@ -18,7 +18,6 @@ import cuecompressors.BLZCoder;
 /*--  Code based on "Nintendo DS rom tool", copyright (C) DevkitPro         --*/
 /*--  Original Code by Rafael Vuijk, Dave Murphy, Alexei Karpenko           --*/
 /*--                                                                        --*/
-/*--  Ported to Java by sneed under the terms of the GPL:                   --*/
 /*--                                                                        --*/
 /*--  This program is free software: you can redistribute it and/or modify  --*/
 /*--  it under the terms of the GNU General Public License as published by  --*/
diff --git a/src/com/sneed/pkrandom/newnds/NDSY9Entry.java b/src/com/pkrandom/newnds/NDSY9Entry.java
index 43bf376..20c2836 100755
--- a/src/com/sneed/pkrandom/newnds/NDSY9Entry.java
+++ b/src/com/pkrandom/newnds/NDSY9Entry.java
@@ -1,11 +1,11 @@
-package com.sneed.pkrandom.newnds;
+package com.pkrandom.newnds;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 import cuecompressors.BLZCoder;
 
@@ -14,7 +14,6 @@ import cuecompressors.BLZCoder;
 /*--  Code based on "Nintendo DS rom tool", copyright (C) DevkitPro         --*/
 /*--  Original Code by Rafael Vuijk, Dave Murphy, Alexei Karpenko           --*/
 /*--                                                                        --*/
-/*--  Ported to Java by sneed under the terms of the GPL:               --*/
 /*--                                                                        --*/
 /*--  This program is free software: you can redistribute it and/or modify  --*/
 /*--  it under the terms of the GNU General Public License as published by  --*/
diff --git a/src/com/sneed/pkrandom/patches/bwexp/crystal_en_bwxp.ips b/src/com/pkrandom/patches/bwexp/crystal_en_bwxp.ips
index 1286524..1286524 100644
--- a/src/com/sneed/pkrandom/patches/bwexp/crystal_en_bwxp.ips
+++ b/src/com/pkrandom/patches/bwexp/crystal_en_bwxp.ips
diff --git a/src/com/sneed/pkrandom/patches/bwexp/gs_en_bwxp.ips b/src/com/pkrandom/patches/bwexp/gs_en_bwxp.ips
index e4bf2e3..e4bf2e3 100644
--- a/src/com/sneed/pkrandom/patches/bwexp/gs_en_bwxp.ips
+++ b/src/com/pkrandom/patches/bwexp/gs_en_bwxp.ips
diff --git a/src/com/sneed/pkrandom/patches/bwexp/rb_en_bwxp.ips b/src/com/pkrandom/patches/bwexp/rb_en_bwxp.ips
index e7e929a..e7e929a 100644
--- a/src/com/sneed/pkrandom/patches/bwexp/rb_en_bwxp.ips
+++ b/src/com/pkrandom/patches/bwexp/rb_en_bwxp.ips
diff --git a/src/com/sneed/pkrandom/patches/bwexp/yellow_en_bwxp.ips b/src/com/pkrandom/patches/bwexp/yellow_en_bwxp.ips
index 021fa97..021fa97 100644
--- a/src/com/sneed/pkrandom/patches/bwexp/yellow_en_bwxp.ips
+++ b/src/com/pkrandom/patches/bwexp/yellow_en_bwxp.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/em_firstbattle.ips b/src/com/pkrandom/patches/hardcoded_statics/em_firstbattle.ips
index 3b6385d..3b6385d 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/em_firstbattle.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/em_firstbattle.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/fr_marowak_10.ips b/src/com/pkrandom/patches/hardcoded_statics/fr_marowak_10.ips
index 856297e..856297e 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/fr_marowak_10.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/fr_marowak_10.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/fr_marowak_11.ips b/src/com/pkrandom/patches/hardcoded_statics/fr_marowak_11.ips
index 797d12b..797d12b 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/fr_marowak_11.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/fr_marowak_11.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/lg_marowak_10.ips b/src/com/pkrandom/patches/hardcoded_statics/lg_marowak_10.ips
index eacbc91..eacbc91 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/lg_marowak_10.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/lg_marowak_10.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/lg_marowak_11.ips b/src/com/pkrandom/patches/hardcoded_statics/lg_marowak_11.ips
index 057ec3a..057ec3a 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/lg_marowak_11.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/lg_marowak_11.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_10.ips b/src/com/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_10.ips
index 22c093a..22c093a 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_10.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_10.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_11.ips b/src/com/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_11.ips
index 3ccd60f..3ccd60f 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_11.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/roamers/fr_roamers_11.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/hgss_roamers.ips b/src/com/pkrandom/patches/hardcoded_statics/roamers/hgss_roamers.ips
index 7667156..7667156 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/hgss_roamers.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/roamers/hgss_roamers.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_10.ips b/src/com/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_10.ips
index 03a8e74..03a8e74 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_10.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_10.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_11.ips b/src/com/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_11.ips
index c7ed279..c7ed279 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_11.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/roamers/lg_roamers_11.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/plat_roamers.ips b/src/com/pkrandom/patches/hardcoded_statics/roamers/plat_roamers.ips
index 0dd15fe..0dd15fe 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/roamers/plat_roamers.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/roamers/plat_roamers.ips
diff --git a/src/com/sneed/pkrandom/patches/hardcoded_statics/rs_firstbattle.ips b/src/com/pkrandom/patches/hardcoded_statics/rs_firstbattle.ips
index 4d9fd8c..4d9fd8c 100644
--- a/src/com/sneed/pkrandom/patches/hardcoded_statics/rs_firstbattle.ips
+++ b/src/com/pkrandom/patches/hardcoded_statics/rs_firstbattle.ips
diff --git a/src/com/sneed/pkrandom/patches/hgss_catching_tutorialfix.ips b/src/com/pkrandom/patches/hgss_catching_tutorialfix.ips
index ec5932d..ec5932d 100644
--- a/src/com/sneed/pkrandom/patches/hgss_catching_tutorialfix.ips
+++ b/src/com/pkrandom/patches/hgss_catching_tutorialfix.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/b1_instant_text.ips b/src/com/pkrandom/patches/instant_text/b1_instant_text.ips
index fc140b0..fc140b0 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/b1_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/b1_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/b2_instant_text.ips b/src/com/pkrandom/patches/instant_text/b2_instant_text.ips
index 8c3ad4f..8c3ad4f 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/b2_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/b2_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/dp_instant_text.ips b/src/com/pkrandom/patches/instant_text/dp_instant_text.ips
index 82dc56c..82dc56c 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/dp_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/dp_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/em_instant_text.ips b/src/com/pkrandom/patches/instant_text/em_instant_text.ips
index 40c11a5..40c11a5 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/em_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/em_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/fr_10_instant_text.ips b/src/com/pkrandom/patches/instant_text/fr_10_instant_text.ips
index 39a8907..39a8907 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/fr_10_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/fr_10_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/fr_11_instant_text.ips b/src/com/pkrandom/patches/instant_text/fr_11_instant_text.ips
index 6f17ea8..6f17ea8 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/fr_11_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/fr_11_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/hgss_instant_text.ips b/src/com/pkrandom/patches/instant_text/hgss_instant_text.ips
index 7352d3e..7352d3e 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/hgss_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/hgss_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/lg_10_instant_text.ips b/src/com/pkrandom/patches/instant_text/lg_10_instant_text.ips
index 4236c85..4236c85 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/lg_10_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/lg_10_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/lg_11_instant_text.ips b/src/com/pkrandom/patches/instant_text/lg_11_instant_text.ips
index 5138d23..5138d23 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/lg_11_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/lg_11_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/plat_instant_text.ips b/src/com/pkrandom/patches/instant_text/plat_instant_text.ips
index a7c63d0..a7c63d0 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/plat_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/plat_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/ruby_10_instant_text.ips b/src/com/pkrandom/patches/instant_text/ruby_10_instant_text.ips
index 43c46a4..43c46a4 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/ruby_10_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/ruby_10_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/ruby_11_instant_text.ips b/src/com/pkrandom/patches/instant_text/ruby_11_instant_text.ips
index f03925e..f03925e 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/ruby_11_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/ruby_11_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/ruby_12_instant_text.ips b/src/com/pkrandom/patches/instant_text/ruby_12_instant_text.ips
index f03925e..f03925e 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/ruby_12_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/ruby_12_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/sapphire_10_instant_text.ips b/src/com/pkrandom/patches/instant_text/sapphire_10_instant_text.ips
index e0a33a8..e0a33a8 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/sapphire_10_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/sapphire_10_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/sapphire_11_instant_text.ips b/src/com/pkrandom/patches/instant_text/sapphire_11_instant_text.ips
index 0fe1ab2..0fe1ab2 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/sapphire_11_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/sapphire_11_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/sapphire_12_instant_text.ips b/src/com/pkrandom/patches/instant_text/sapphire_12_instant_text.ips
index 0fe1ab2..0fe1ab2 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/sapphire_12_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/sapphire_12_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/w1_instant_text.ips b/src/com/pkrandom/patches/instant_text/w1_instant_text.ips
index f633ba9..f633ba9 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/w1_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/w1_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/instant_text/w2_instant_text.ips b/src/com/pkrandom/patches/instant_text/w2_instant_text.ips
index 1c8180b..1c8180b 100644
--- a/src/com/sneed/pkrandom/patches/instant_text/w2_instant_text.ips
+++ b/src/com/pkrandom/patches/instant_text/w2_instant_text.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/black2_musicfix.ips b/src/com/pkrandom/patches/musicfix/black2_musicfix.ips
index 8e6db21..8e6db21 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/black2_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/black2_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/black2_ovl36_musicfix.ips b/src/com/pkrandom/patches/musicfix/black2_ovl36_musicfix.ips
index 8cb959d..8cb959d 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/black2_ovl36_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/black2_ovl36_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/black_musicfix.ips b/src/com/pkrandom/patches/musicfix/black_musicfix.ips
index d08f7da..d08f7da 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/black_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/black_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/black_ovl21_musicfix.ips b/src/com/pkrandom/patches/musicfix/black_ovl21_musicfix.ips
index cb48339..cb48339 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/black_ovl21_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/black_ovl21_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/diamond_musicfix.ips b/src/com/pkrandom/patches/musicfix/diamond_musicfix.ips
index fc374b8..fc374b8 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/diamond_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/diamond_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/em_musicfix.ips b/src/com/pkrandom/patches/musicfix/em_musicfix.ips
index 58be766..58be766 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/em_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/em_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/fr_musicfix_10.ips b/src/com/pkrandom/patches/musicfix/fr_musicfix_10.ips
index adf01b9..adf01b9 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/fr_musicfix_10.ips
+++ b/src/com/pkrandom/patches/musicfix/fr_musicfix_10.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/fr_musicfix_11.ips b/src/com/pkrandom/patches/musicfix/fr_musicfix_11.ips
index 67e026c..67e026c 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/fr_musicfix_11.ips
+++ b/src/com/pkrandom/patches/musicfix/fr_musicfix_11.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/lg_musicfix_10.ips b/src/com/pkrandom/patches/musicfix/lg_musicfix_10.ips
index 287f26f..287f26f 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/lg_musicfix_10.ips
+++ b/src/com/pkrandom/patches/musicfix/lg_musicfix_10.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/lg_musicfix_11.ips b/src/com/pkrandom/patches/musicfix/lg_musicfix_11.ips
index 49be790..49be790 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/lg_musicfix_11.ips
+++ b/src/com/pkrandom/patches/musicfix/lg_musicfix_11.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/plat_musicfix.ips b/src/com/pkrandom/patches/musicfix/plat_musicfix.ips
index 61f6857..61f6857 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/plat_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/plat_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/white2_musicfix.ips b/src/com/pkrandom/patches/musicfix/white2_musicfix.ips
index b422ce5..b422ce5 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/white2_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/white2_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/white2_ovl36_musicfix.ips b/src/com/pkrandom/patches/musicfix/white2_ovl36_musicfix.ips
index 93e6f67..93e6f67 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/white2_ovl36_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/white2_ovl36_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/white_musicfix.ips b/src/com/pkrandom/patches/musicfix/white_musicfix.ips
index 8991702..8991702 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/white_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/white_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/musicfix/white_ovl21_musicfix.ips b/src/com/pkrandom/patches/musicfix/white_ovl21_musicfix.ips
index 6207258..6207258 100644
--- a/src/com/sneed/pkrandom/patches/musicfix/white_ovl21_musicfix.ips
+++ b/src/com/pkrandom/patches/musicfix/white_ovl21_musicfix.ips
diff --git a/src/com/sneed/pkrandom/patches/national_dex/bw1_national_dex.ips b/src/com/pkrandom/patches/national_dex/bw1_national_dex.ips
index 13afb31..13afb31 100644
--- a/src/com/sneed/pkrandom/patches/national_dex/bw1_national_dex.ips
+++ b/src/com/pkrandom/patches/national_dex/bw1_national_dex.ips
diff --git a/src/com/sneed/pkrandom/patches/national_dex/bw2_national_dex.ips b/src/com/pkrandom/patches/national_dex/bw2_national_dex.ips
index 2981e85..2981e85 100644
--- a/src/com/sneed/pkrandom/patches/national_dex/bw2_national_dex.ips
+++ b/src/com/pkrandom/patches/national_dex/bw2_national_dex.ips
diff --git a/src/com/sneed/pkrandom/patches/national_dex/dp_national_dex.ips b/src/com/pkrandom/patches/national_dex/dp_national_dex.ips
index e9aea86..e9aea86 100644
--- a/src/com/sneed/pkrandom/patches/national_dex/dp_national_dex.ips
+++ b/src/com/pkrandom/patches/national_dex/dp_national_dex.ips
diff --git a/src/com/sneed/pkrandom/patches/national_dex/hgss_national_dex.ips b/src/com/pkrandom/patches/national_dex/hgss_national_dex.ips
index 0c7d3eb..0c7d3eb 100644
--- a/src/com/sneed/pkrandom/patches/national_dex/hgss_national_dex.ips
+++ b/src/com/pkrandom/patches/national_dex/hgss_national_dex.ips
diff --git a/src/com/sneed/pkrandom/patches/national_dex/plat_national_dex.ips b/src/com/pkrandom/patches/national_dex/plat_national_dex.ips
index 612f314..612f314 100644
--- a/src/com/sneed/pkrandom/patches/national_dex/plat_national_dex.ips
+++ b/src/com/pkrandom/patches/national_dex/plat_national_dex.ips
diff --git a/src/com/sneed/pkrandom/patches/pt_fast_distortion_world.ips b/src/com/pkrandom/patches/pt_fast_distortion_world.ips
index 9279b5b..9279b5b 100644
--- a/src/com/sneed/pkrandom/patches/pt_fast_distortion_world.ips
+++ b/src/com/pkrandom/patches/pt_fast_distortion_world.ips
diff --git a/src/com/sneed/pkrandom/patches/rb_en_critrate.ips b/src/com/pkrandom/patches/rb_en_critrate.ips
index f08ef39..f08ef39 100755
--- a/src/com/sneed/pkrandom/patches/rb_en_critrate.ips
+++ b/src/com/pkrandom/patches/rb_en_critrate.ips
diff --git a/src/com/sneed/pkrandom/patches/rb_en_xaccnerf.ips b/src/com/pkrandom/patches/rb_en_xaccnerf.ips
index 426753a..426753a 100755
--- a/src/com/sneed/pkrandom/patches/rb_en_xaccnerf.ips
+++ b/src/com/pkrandom/patches/rb_en_xaccnerf.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/black2_ovl284_shedinja.ips b/src/com/pkrandom/patches/shedinja/black2_ovl284_shedinja.ips
index 3da8290..3da8290 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/black2_ovl284_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/black2_ovl284_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/black2_shedinja.ips b/src/com/pkrandom/patches/shedinja/black2_shedinja.ips
index c6eb474..c6eb474 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/black2_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/black2_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/black_ovl195_shedinja.ips b/src/com/pkrandom/patches/shedinja/black_ovl195_shedinja.ips
index b6fd282..b6fd282 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/black_ovl195_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/black_ovl195_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/black_shedinja.ips b/src/com/pkrandom/patches/shedinja/black_shedinja.ips
index 08acd5e..08acd5e 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/black_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/black_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/white2_ovl284_shedinja.ips b/src/com/pkrandom/patches/shedinja/white2_ovl284_shedinja.ips
index 3da8290..3da8290 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/white2_ovl284_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/white2_ovl284_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/white2_shedinja.ips b/src/com/pkrandom/patches/shedinja/white2_shedinja.ips
index 2901b63..2901b63 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/white2_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/white2_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/white_ovl195_shedinja.ips b/src/com/pkrandom/patches/shedinja/white_ovl195_shedinja.ips
index b6fd282..b6fd282 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/white_ovl195_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/white_ovl195_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/shedinja/white_shedinja.ips b/src/com/pkrandom/patches/shedinja/white_shedinja.ips
index a00135b..a00135b 100644
--- a/src/com/sneed/pkrandom/patches/shedinja/white_shedinja.ips
+++ b/src/com/pkrandom/patches/shedinja/white_shedinja.ips
diff --git a/src/com/sneed/pkrandom/patches/yellow_en_critrate.ips b/src/com/pkrandom/patches/yellow_en_critrate.ips
index a691f04..a691f04 100755
--- a/src/com/sneed/pkrandom/patches/yellow_en_critrate.ips
+++ b/src/com/pkrandom/patches/yellow_en_critrate.ips
diff --git a/src/com/sneed/pkrandom/patches/yellow_en_xaccnerf.ips b/src/com/pkrandom/patches/yellow_en_xaccnerf.ips
index e968abe..e968abe 100755
--- a/src/com/sneed/pkrandom/patches/yellow_en_xaccnerf.ips
+++ b/src/com/pkrandom/patches/yellow_en_xaccnerf.ips
diff --git a/src/com/sneed/pkrandom/pokemon/Aura.java b/src/com/pkrandom/pokemon/Aura.java
index f5d9e9c..946e844 100644
--- a/src/com/sneed/pkrandom/pokemon/Aura.java
+++ b/src/com/pkrandom/pokemon/Aura.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Aura.java - handles the Aura that Totem Pokemon have                  --*/
@@ -23,7 +23,7 @@ package com.sneed.pkrandom.pokemon;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.RomFunctions;
+import com.pkrandom.RomFunctions;
 
 import java.util.Random;
 
diff --git a/src/com/sneed/pkrandom/pokemon/CriticalChance.java b/src/com/pkrandom/pokemon/CriticalChance.java
index f7445d0..7fd02a8 100644
--- a/src/com/sneed/pkrandom/pokemon/CriticalChance.java
+++ b/src/com/pkrandom/pokemon/CriticalChance.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  CriticalChance.java - represents a move's odds to critical hit.       --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Effectiveness.java b/src/com/pkrandom/pokemon/Effectiveness.java
index 362ca60..edfd3f3 100644
--- a/src/com/sneed/pkrandom/pokemon/Effectiveness.java
+++ b/src/com/pkrandom/pokemon/Effectiveness.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Effectiveness.java - represents a type's effectiveness and the        --*/
 /*--  results of applying super effectiveness and resistance                --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Encounter.java b/src/com/pkrandom/pokemon/Encounter.java
index 91e169f..9b391ec 100755
--- a/src/com/sneed/pkrandom/pokemon/Encounter.java
+++ b/src/com/pkrandom/pokemon/Encounter.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Encounter.java - contains one wild Pokemon slot                       --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/EncounterSet.java b/src/com/pkrandom/pokemon/EncounterSet.java
index ac49523..80001ef 100755
--- a/src/com/sneed/pkrandom/pokemon/EncounterSet.java
+++ b/src/com/pkrandom/pokemon/EncounterSet.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  EncounterSet.java - contains a group of wild Pokemon                  --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Evolution.java b/src/com/pkrandom/pokemon/Evolution.java
index fc29012..4721fe1 100755
--- a/src/com/sneed/pkrandom/pokemon/Evolution.java
+++ b/src/com/pkrandom/pokemon/Evolution.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Evolution.java - represents an evolution between 2 Pokemon.           --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/EvolutionType.java b/src/com/pkrandom/pokemon/EvolutionType.java
index 6b3e1c7..1042820 100755
--- a/src/com/sneed/pkrandom/pokemon/EvolutionType.java
+++ b/src/com/pkrandom/pokemon/EvolutionType.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  EvolutionType.java - describes what process is necessary for an       --*/
 /*--                       evolution to occur                               --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/EvolutionUpdate.java b/src/com/pkrandom/pokemon/EvolutionUpdate.java
index 1aa937c..5301d82 100644
--- a/src/com/sneed/pkrandom/pokemon/EvolutionUpdate.java
+++ b/src/com/pkrandom/pokemon/EvolutionUpdate.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 public class EvolutionUpdate implements Comparable<EvolutionUpdate> {
 
diff --git a/src/com/sneed/pkrandom/pokemon/ExpCurve.java b/src/com/pkrandom/pokemon/ExpCurve.java
index da21f38..3b018b0 100755
--- a/src/com/sneed/pkrandom/pokemon/ExpCurve.java
+++ b/src/com/pkrandom/pokemon/ExpCurve.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  ExpCurve.java - represents the EXP curves that a Pokemon can have.    --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/FormeInfo.java b/src/com/pkrandom/pokemon/FormeInfo.java
index 8c57df3..498f4c0 100644
--- a/src/com/sneed/pkrandom/pokemon/FormeInfo.java
+++ b/src/com/pkrandom/pokemon/FormeInfo.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  FormeInfo.java - stores information about a Pokemon's alt formes.     --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Gen1Pokemon.java b/src/com/pkrandom/pokemon/Gen1Pokemon.java
index b63f1ed..af73feb 100644
--- a/src/com/sneed/pkrandom/pokemon/Gen1Pokemon.java
+++ b/src/com/pkrandom/pokemon/Gen1Pokemon.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen1Pokemon.java - represents an individual Gen 1 Pokemon. Used to    --*/
diff --git a/src/com/sneed/pkrandom/pokemon/GenRestrictions.java b/src/com/pkrandom/pokemon/GenRestrictions.java
index 6c71a27..7fea8c3 100755
--- a/src/com/sneed/pkrandom/pokemon/GenRestrictions.java
+++ b/src/com/pkrandom/pokemon/GenRestrictions.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  GenRestrictions.java - stores what generations the user has limited.  --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/IngameTrade.java b/src/com/pkrandom/pokemon/IngameTrade.java
index 6d3bef2..4dfdc76 100755
--- a/src/com/sneed/pkrandom/pokemon/IngameTrade.java
+++ b/src/com/pkrandom/pokemon/IngameTrade.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  IngameTrade.java - stores Pokemon trades with in-game NPCs.           --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/ItemList.java b/src/com/pkrandom/pokemon/ItemList.java
index ee9d11a..ed771d3 100755
--- a/src/com/sneed/pkrandom/pokemon/ItemList.java
+++ b/src/com/pkrandom/pokemon/ItemList.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  ItemList.java - contains the list of all items in the game.           --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/MegaEvolution.java b/src/com/pkrandom/pokemon/MegaEvolution.java
index 2e6688f..fcf6ff3 100644
--- a/src/com/sneed/pkrandom/pokemon/MegaEvolution.java
+++ b/src/com/pkrandom/pokemon/MegaEvolution.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  MegaEvolution.java - represents an mega evolution                     --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Move.java b/src/com/pkrandom/pokemon/Move.java
index 4aa8c20..c22a448 100755
--- a/src/com/sneed/pkrandom/pokemon/Move.java
+++ b/src/com/pkrandom/pokemon/Move.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Move.java - represents a move usable by Pokemon.                      --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -24,7 +23,7 @@ package com.sneed.pkrandom.pokemon;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.constants.GlobalConstants;
+import com.pkrandom.constants.GlobalConstants;
 
 public class Move {
     public class StatChange {
diff --git a/src/com/sneed/pkrandom/pokemon/MoveCategory.java b/src/com/pkrandom/pokemon/MoveCategory.java
index c8a754f..a2b976a 100644
--- a/src/com/sneed/pkrandom/pokemon/MoveCategory.java
+++ b/src/com/pkrandom/pokemon/MoveCategory.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  DamageType.java - represents a move's Physical/Special split value.   --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/MoveLearnt.java b/src/com/pkrandom/pokemon/MoveLearnt.java
index 87b10aa..d8cd9b4 100755
--- a/src/com/sneed/pkrandom/pokemon/MoveLearnt.java
+++ b/src/com/pkrandom/pokemon/MoveLearnt.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  MoveLearnt.java - represents a move learnt by a Pokemon at a level.   --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/MoveSynergy.java b/src/com/pkrandom/pokemon/MoveSynergy.java
index 0d1c412..51b7ce9 100644
--- a/src/com/sneed/pkrandom/pokemon/MoveSynergy.java
+++ b/src/com/pkrandom/pokemon/MoveSynergy.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  MoveSynergy.java - synergies between moves, or between                --*/
 /*--                     abilities/stats and moves                          --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed            --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -25,8 +24,8 @@ package com.sneed.pkrandom.pokemon;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.constants.Abilities;
-import com.sneed.pkrandom.constants.Moves;
+import com.pkrandom.constants.Abilities;
+import com.pkrandom.constants.Moves;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/sneed/pkrandom/pokemon/PickupItem.java b/src/com/pkrandom/pokemon/PickupItem.java
index 46e180e..9b90683 100644
--- a/src/com/sneed/pkrandom/pokemon/PickupItem.java
+++ b/src/com/pkrandom/pokemon/PickupItem.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 public class PickupItem {
     public int item;
diff --git a/src/com/sneed/pkrandom/pokemon/Pokemon.java b/src/com/pkrandom/pokemon/Pokemon.java
index 9d085c6..c868b9d 100755
--- a/src/com/sneed/pkrandom/pokemon/Pokemon.java
+++ b/src/com/pkrandom/pokemon/Pokemon.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Pokemon.java - represents an individual Pokemon, and contains         --*/
 /*--                 common Pokemon-related functions.                      --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -25,7 +24,7 @@ package com.sneed.pkrandom.pokemon;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.constants.Species;
+import com.pkrandom.constants.Species;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/sneed/pkrandom/pokemon/SOSType.java b/src/com/pkrandom/pokemon/SOSType.java
index a5cea3f..95c8639 100644
--- a/src/com/sneed/pkrandom/pokemon/SOSType.java
+++ b/src/com/pkrandom/pokemon/SOSType.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  SOSType.java - represents a Gen 7 SOS Encounter's type                --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Shop.java b/src/com/pkrandom/pokemon/Shop.java
index 0c1f748..34a9f1d 100644
--- a/src/com/sneed/pkrandom/pokemon/Shop.java
+++ b/src/com/pkrandom/pokemon/Shop.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Shop.java - represents a shop with a list of purchasable items.       --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Stat.java b/src/com/pkrandom/pokemon/Stat.java
index 7b0b579..4826e93 100644
--- a/src/com/sneed/pkrandom/pokemon/Stat.java
+++ b/src/com/pkrandom/pokemon/Stat.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Stat.java - represents a Pokemon's stat                               --*/
diff --git a/src/com/sneed/pkrandom/pokemon/StatChange.java b/src/com/pkrandom/pokemon/StatChange.java
index 8adee17..7d55e9e 100644
--- a/src/com/sneed/pkrandom/pokemon/StatChange.java
+++ b/src/com/pkrandom/pokemon/StatChange.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  StatChange.java - stores updated stat information for a Pokemon       --*/
diff --git a/src/com/sneed/pkrandom/pokemon/StatChangeMoveType.java b/src/com/pkrandom/pokemon/StatChangeMoveType.java
index 75a5c3d..18a0623 100644
--- a/src/com/sneed/pkrandom/pokemon/StatChangeMoveType.java
+++ b/src/com/pkrandom/pokemon/StatChangeMoveType.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  StatChangeType.java - represents the different types of moves         --*/
diff --git a/src/com/sneed/pkrandom/pokemon/StatChangeType.java b/src/com/pkrandom/pokemon/StatChangeType.java
index 0908050..e79046c 100644
--- a/src/com/sneed/pkrandom/pokemon/StatChangeType.java
+++ b/src/com/pkrandom/pokemon/StatChangeType.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  StatChangeType.java - represents the types of stat buffs that a move  --*/
diff --git a/src/com/sneed/pkrandom/pokemon/StaticEncounter.java b/src/com/pkrandom/pokemon/StaticEncounter.java
index 2bd1840..285a27b 100644
--- a/src/com/sneed/pkrandom/pokemon/StaticEncounter.java
+++ b/src/com/pkrandom/pokemon/StaticEncounter.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  StaticEncounter.java - stores a static encounter in Gen 6+            --*/
diff --git a/src/com/sneed/pkrandom/pokemon/StatusMoveType.java b/src/com/pkrandom/pokemon/StatusMoveType.java
index 9b1df97..a2c0bc7 100644
--- a/src/com/sneed/pkrandom/pokemon/StatusMoveType.java
+++ b/src/com/pkrandom/pokemon/StatusMoveType.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  StatusMoveType.java - represents the different types of moves         --*/
diff --git a/src/com/sneed/pkrandom/pokemon/StatusType.java b/src/com/pkrandom/pokemon/StatusType.java
index aa4ef0f..bf1e63b 100644
--- a/src/com/sneed/pkrandom/pokemon/StatusType.java
+++ b/src/com/pkrandom/pokemon/StatusType.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  StatusType.java - represents the different types of status effects    --*/
diff --git a/src/com/sneed/pkrandom/pokemon/TotemPokemon.java b/src/com/pkrandom/pokemon/TotemPokemon.java
index 55139aa..5134044 100644
--- a/src/com/sneed/pkrandom/pokemon/TotemPokemon.java
+++ b/src/com/pkrandom/pokemon/TotemPokemon.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  TotemPokemon.java - represents a Totem Pokemon encounter              --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Trainer.java b/src/com/pkrandom/pokemon/Trainer.java
index 7509628..ee822fc 100755
--- a/src/com/sneed/pkrandom/pokemon/Trainer.java
+++ b/src/com/pkrandom/pokemon/Trainer.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Trainer.java - represents a Trainer's pokemon set/other details.      --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/TrainerPokemon.java b/src/com/pkrandom/pokemon/TrainerPokemon.java
index 98ce3bc..9323f12 100755
--- a/src/com/sneed/pkrandom/pokemon/TrainerPokemon.java
+++ b/src/com/pkrandom/pokemon/TrainerPokemon.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  TrainerPokemon.java - represents a Pokemon owned by a trainer.        --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
diff --git a/src/com/sneed/pkrandom/pokemon/Type.java b/src/com/pkrandom/pokemon/Type.java
index d919047..8dfff51 100755
--- a/src/com/sneed/pkrandom/pokemon/Type.java
+++ b/src/com/pkrandom/pokemon/Type.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  Type.java - represents a Pokemon or move type.                        --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -29,7 +28,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import com.sneed.pkrandom.RomFunctions;
+import com.pkrandom.RomFunctions;
 
 public enum Type {
 
diff --git a/src/com/sneed/pkrandom/pokemon/TypeRelationship.java b/src/com/pkrandom/pokemon/TypeRelationship.java
index 1b81cbd..b63dc73 100644
--- a/src/com/sneed/pkrandom/pokemon/TypeRelationship.java
+++ b/src/com/pkrandom/pokemon/TypeRelationship.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.pokemon;
+package com.pkrandom.pokemon;
 
 /*----------------------------------------------------------------------------*/
 /*--  TypeRelationship.java - represents the relationship between an        --*/
diff --git a/src/com/sneed/pkrandom/romhandlers/Abstract3DSRomHandler.java b/src/com/pkrandom/romhandlers/Abstract3DSRomHandler.java
index 5bd08f9..94b7111 100644
--- a/src/com/sneed/pkrandom/romhandlers/Abstract3DSRomHandler.java
+++ b/src/com/pkrandom/romhandlers/Abstract3DSRomHandler.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  Abstract3DSRomHandler.java - a base class for 3DS rom handlers        --*/
@@ -24,13 +24,13 @@ package com.sneed.pkrandom.romhandlers;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.ctr.GARCArchive;
-import com.sneed.pkrandom.ctr.NCCH;
-import com.sneed.pkrandom.exceptions.CannotWriteToLocationException;
-import com.sneed.pkrandom.exceptions.EncryptedROMException;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.ctr.GARCArchive;
+import com.pkrandom.ctr.NCCH;
+import com.pkrandom.exceptions.CannotWriteToLocationException;
+import com.pkrandom.exceptions.EncryptedROMException;
+import com.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.pokemon.Type;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/src/com/sneed/pkrandom/romhandlers/AbstractDSRomHandler.java b/src/com/pkrandom/romhandlers/AbstractDSRomHandler.java
index 09be3d8..3736758 100755
--- a/src/com/sneed/pkrandom/romhandlers/AbstractDSRomHandler.java
+++ b/src/com/pkrandom/romhandlers/AbstractDSRomHandler.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  AbstractDSRomHandler.java - a base class for DS rom handlers          --*/
 /*--                              which standardises common DS functions.   --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed            --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -31,13 +30,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.RomFunctions;
-import com.sneed.pkrandom.exceptions.CannotWriteToLocationException;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
-import com.sneed.pkrandom.newnds.NARCArchive;
-import com.sneed.pkrandom.newnds.NDSRom;
-import com.sneed.pkrandom.pokemon.Type;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.RomFunctions;
+import com.pkrandom.exceptions.CannotWriteToLocationException;
+import com.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.newnds.NARCArchive;
+import com.pkrandom.newnds.NDSRom;
+import com.pkrandom.pokemon.Type;
 
 public abstract class AbstractDSRomHandler extends AbstractRomHandler {
 
diff --git a/src/com/sneed/pkrandom/romhandlers/AbstractGBCRomHandler.java b/src/com/pkrandom/romhandlers/AbstractGBCRomHandler.java
index e006e17..897b6cd 100644
--- a/src/com/sneed/pkrandom/romhandlers/AbstractGBCRomHandler.java
+++ b/src/com/pkrandom/romhandlers/AbstractGBCRomHandler.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  AbstractGBCRomHandler.java - an extension of AbstractGBRomHandler     --*/
 /*--                               used for Gen 1 and Gen 2.                --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -34,8 +33,8 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Scanner;
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.constants.GBConstants;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.constants.GBConstants;
 
 public abstract class AbstractGBCRomHandler extends AbstractGBRomHandler {
 
diff --git a/src/com/sneed/pkrandom/romhandlers/AbstractGBRomHandler.java b/src/com/pkrandom/romhandlers/AbstractGBRomHandler.java
index a11cce5..a581f3d 100755
--- a/src/com/sneed/pkrandom/romhandlers/AbstractGBRomHandler.java
+++ b/src/com/pkrandom/romhandlers/AbstractGBRomHandler.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  AbstractGBRomHandler.java - a base class for GB/GBA rom handlers      --*/
 /*--                              which standardises common GB(A) functions.--*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed            --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -34,9 +33,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Random;
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.exceptions.CannotWriteToLocationException;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.exceptions.CannotWriteToLocationException;
+import com.pkrandom.exceptions.RandomizerIOException;
 
 public abstract class AbstractGBRomHandler extends AbstractRomHandler {
 
diff --git a/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java b/src/com/pkrandom/romhandlers/AbstractRomHandler.java
index 658bb01..d0c185c 100755
--- a/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java
+++ b/src/com/pkrandom/romhandlers/AbstractRomHandler.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  AbstractRomHandler.java - a base class for all rom handlers which     --*/
@@ -8,7 +8,6 @@ package com.sneed.pkrandom.romhandlers;
 /*--                            handler.                                    --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -32,10 +31,10 @@ import java.io.PrintStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.sneed.pkrandom.*;
-import com.sneed.pkrandom.constants.*;
-import com.sneed.pkrandom.exceptions.RandomizationException;
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.*;
+import com.pkrandom.constants.*;
+import com.pkrandom.exceptions.RandomizationException;
+import com.pkrandom.pokemon.*;
 
 public abstract class AbstractRomHandler implements RomHandler {
 
diff --git a/src/com/sneed/pkrandom/romhandlers/Gen1RomHandler.java b/src/com/pkrandom/romhandlers/Gen1RomHandler.java
index bb55bb6..69cd51e 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen1RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen1RomHandler.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.romhandlers;

+package com.pkrandom.romhandlers;

 

 /*----------------------------------------------------------------------------*/

 /*--  Gen1RomHandler.java - randomizer handler for R/B/Y.                   --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -43,11 +42,11 @@ import java.util.TreeMap;
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

-import com.sneed.pkrandom.*;

-import com.sneed.pkrandom.constants.*;

-import com.sneed.pkrandom.exceptions.RandomizationException;

-import com.sneed.pkrandom.exceptions.RandomizerIOException;

-import com.sneed.pkrandom.pokemon.*;

+import com.pkrandom.*;

+import com.pkrandom.constants.*;

+import com.pkrandom.exceptions.RandomizationException;

+import com.pkrandom.exceptions.RandomizerIOException;

+import com.pkrandom.pokemon.*;

 import compressors.Gen1Decmp;

 

 public class Gen1RomHandler extends AbstractGBCRomHandler {

diff --git a/src/com/sneed/pkrandom/romhandlers/Gen2RomHandler.java b/src/com/pkrandom/romhandlers/Gen2RomHandler.java
index 267a42c..2cf4a77 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen2RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen2RomHandler.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.romhandlers;

+package com.pkrandom.romhandlers;

 

 /*----------------------------------------------------------------------------*/

 /*--  Gen2RomHandler.java - randomizer handler for G/S/C.                   --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -34,10 +33,10 @@ import java.util.*;
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

-import com.sneed.pkrandom.*;

-import com.sneed.pkrandom.constants.*;

-import com.sneed.pkrandom.exceptions.RandomizerIOException;

-import com.sneed.pkrandom.pokemon.*;

+import com.pkrandom.*;

+import com.pkrandom.constants.*;

+import com.pkrandom.exceptions.RandomizerIOException;

+import com.pkrandom.pokemon.*;

 import compressors.Gen2Decmp;

 

 public class Gen2RomHandler extends AbstractGBCRomHandler {

diff --git a/src/com/sneed/pkrandom/romhandlers/Gen3RomHandler.java b/src/com/pkrandom/romhandlers/Gen3RomHandler.java
index cefb3c4..838315d 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen3RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen3RomHandler.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen3RomHandler.java - randomizer handler for R/S/E/FR/LG.             --*/
 /*--                                                                        --*/
 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/
-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/
 /*--  Pokemon and any associated names and the like are                     --*/
 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/
 /*--                                                                        --*/
@@ -31,11 +30,11 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import com.sneed.pkrandom.*;
-import com.sneed.pkrandom.constants.*;
-import com.sneed.pkrandom.exceptions.RandomizationException;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.*;
+import com.pkrandom.constants.*;
+import com.pkrandom.exceptions.RandomizationException;
+import com.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.pokemon.*;
 import compressors.DSDecmp;
 
 public class Gen3RomHandler extends AbstractGBRomHandler {
diff --git a/src/com/sneed/pkrandom/romhandlers/Gen4RomHandler.java b/src/com/pkrandom/romhandlers/Gen4RomHandler.java
index cbc7fac..417799e 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen4RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen4RomHandler.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.romhandlers;

+package com.pkrandom.romhandlers;

 

 /*----------------------------------------------------------------------------*/

 /*--  Gen4RomHandler.java - randomizer handler for D/P/Pt/HG/SS.            --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -33,15 +32,15 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import java.util.stream.Collectors;

 

-import com.sneed.pkrandom.*;

-import com.sneed.pkrandom.constants.*;

-import com.sneed.pkrandom.exceptions.RandomizationException;

-import com.sneed.pkrandom.pokemon.*;

+import com.pkrandom.*;

+import com.pkrandom.constants.*;

+import com.pkrandom.exceptions.RandomizationException;

+import com.pkrandom.pokemon.*;

 import thenewpoketext.PokeTextData;

 import thenewpoketext.TextToPoke;

 

-import com.sneed.pkrandom.exceptions.RandomizerIOException;

-import com.sneed.pkrandom.newnds.NARCArchive;

+import com.pkrandom.exceptions.RandomizerIOException;

+import com.pkrandom.newnds.NARCArchive;

 

 public class Gen4RomHandler extends AbstractDSRomHandler {

 

diff --git a/src/com/sneed/pkrandom/romhandlers/Gen5RomHandler.java b/src/com/pkrandom/romhandlers/Gen5RomHandler.java
index 242b2ca..02010e7 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen5RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen5RomHandler.java
@@ -1,10 +1,9 @@
-package com.sneed.pkrandom.romhandlers;

+package com.pkrandom.romhandlers;

 

 /*----------------------------------------------------------------------------*/

 /*--  Gen5RomHandler.java - randomizer handler for B/W/B2/W2.               --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -35,14 +34,14 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 import java.util.stream.IntStream;

 

-import com.sneed.pkrandom.*;

-import com.sneed.pkrandom.constants.*;

-import com.sneed.pkrandom.exceptions.RandomizationException;

-import com.sneed.pkrandom.pokemon.*;

+import com.pkrandom.*;

+import com.pkrandom.constants.*;

+import com.pkrandom.exceptions.RandomizationException;

+import com.pkrandom.pokemon.*;

 import pptxt.PPTxtHandler;

 

-import com.sneed.pkrandom.exceptions.RandomizerIOException;

-import com.sneed.pkrandom.newnds.NARCArchive;

+import com.pkrandom.exceptions.RandomizerIOException;

+import com.pkrandom.newnds.NARCArchive;

 import compressors.DSDecmp;

 

 public class Gen5RomHandler extends AbstractDSRomHandler {

diff --git a/src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java b/src/com/pkrandom/romhandlers/Gen6RomHandler.java
index 012021f..3148238 100644
--- a/src/com/sneed/pkrandom/romhandlers/Gen6RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen6RomHandler.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen6RomHandler.java - randomizer handler for X/Y/OR/AS.               --*/
@@ -23,13 +23,13 @@ package com.sneed.pkrandom.romhandlers;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.*;
-import com.sneed.pkrandom.constants.*;
-import com.sneed.pkrandom.ctr.AMX;
-import com.sneed.pkrandom.ctr.GARCArchive;
-import com.sneed.pkrandom.ctr.Mini;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.*;
+import com.pkrandom.constants.*;
+import com.pkrandom.ctr.AMX;
+import com.pkrandom.ctr.GARCArchive;
+import com.pkrandom.ctr.Mini;
+import com.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.pokemon.*;
 import pptxt.N3DSTxtHandler;
 
 import java.awt.*;
diff --git a/src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java b/src/com/pkrandom/romhandlers/Gen7RomHandler.java
index 1a9909b..bfadd86 100644
--- a/src/com/sneed/pkrandom/romhandlers/Gen7RomHandler.java
+++ b/src/com/pkrandom/romhandlers/Gen7RomHandler.java
@@ -1,4 +1,4 @@
-package com.sneed.pkrandom.romhandlers;
+package com.pkrandom.romhandlers;
 
 /*----------------------------------------------------------------------------*/
 /*--  Gen7RomHandler.java - randomizer handler for Su/Mo/US/UM.             --*/
@@ -23,17 +23,17 @@ package com.sneed.pkrandom.romhandlers;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.FileFunctions;
-import com.sneed.pkrandom.MiscTweak;
-import com.sneed.pkrandom.RomFunctions;
-import com.sneed.pkrandom.Settings;
-import com.sneed.pkrandom.constants.*;
-import com.sneed.pkrandom.ctr.AMX;
-import com.sneed.pkrandom.ctr.BFLIM;
-import com.sneed.pkrandom.ctr.GARCArchive;
-import com.sneed.pkrandom.ctr.Mini;
-import com.sneed.pkrandom.exceptions.RandomizerIOException;
-import com.sneed.pkrandom.pokemon.*;
+import com.pkrandom.FileFunctions;
+import com.pkrandom.MiscTweak;
+import com.pkrandom.RomFunctions;
+import com.pkrandom.Settings;
+import com.pkrandom.constants.*;
+import com.pkrandom.ctr.AMX;
+import com.pkrandom.ctr.BFLIM;
+import com.pkrandom.ctr.GARCArchive;
+import com.pkrandom.ctr.Mini;
+import com.pkrandom.exceptions.RandomizerIOException;
+import com.pkrandom.pokemon.*;
 import pptxt.N3DSTxtHandler;
 
 import java.awt.image.BufferedImage;
diff --git a/src/com/sneed/pkrandom/romhandlers/RomHandler.java b/src/com/pkrandom/romhandlers/RomHandler.java
index 167bded..4d2e2c8 100755
--- a/src/com/sneed/pkrandom/romhandlers/RomHandler.java
+++ b/src/com/pkrandom/romhandlers/RomHandler.java
@@ -1,11 +1,10 @@
-package com.sneed.pkrandom.romhandlers;

+package com.pkrandom.romhandlers;

 

 /*----------------------------------------------------------------------------*/

 /*--  RomHandler.java - defines the functionality that each randomization   --*/

 /*--                    handler must implement.                             --*/

 /*--                                                                        --*/

 /*--  Part of "Universal Pokemon Randomizer ZX" by the UPR-ZX team          --*/

-/*--  Originally part of "Universal Pokemon Randomizer" by sneed        --*/

 /*--  Pokemon and any associated names and the like are                     --*/

 /*--  trademark and (C) Nintendo 1996-2020.                                 --*/

 /*--                                                                        --*/

@@ -32,9 +31,9 @@ import java.util.Map;
 import java.util.Random;

 import java.util.Set;

 

-import com.sneed.pkrandom.MiscTweak;

-import com.sneed.pkrandom.Settings;

-import com.sneed.pkrandom.pokemon.*;

+import com.pkrandom.MiscTweak;

+import com.pkrandom.Settings;

+import com.pkrandom.pokemon.*;

 

 public interface RomHandler {

 

diff --git a/src/compressors/DSDecmp.java b/src/compressors/DSDecmp.java
index 3d7bffc..25d9040 100644
--- a/src/compressors/DSDecmp.java
+++ b/src/compressors/DSDecmp.java
@@ -1,6 +1,6 @@
 package compressors;
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 //MODIFIED DSDECMP-JAVA SOURCE FOR RANDOMIZER'S NEEDS
 //License is below
diff --git a/src/compressors/Gen1Decmp.java b/src/compressors/Gen1Decmp.java
index b07474d..dc15079 100644
--- a/src/compressors/Gen1Decmp.java
+++ b/src/compressors/Gen1Decmp.java
@@ -4,7 +4,6 @@ package compressors;
  * Pokemon Gen 1 sprite decompressor Source:
  * https://github.com/pret/pokemon-reverse-engineering-tools/blob/master/pokemontools/pic.py 
  * (and gfx.py for flatten())
- * Ported to Java by sneed
  *
  */
 public class Gen1Decmp {
diff --git a/src/compressors/Gen2Decmp.java b/src/compressors/Gen2Decmp.java
index 6f59ffb..6960422 100644
--- a/src/compressors/Gen2Decmp.java
+++ b/src/compressors/Gen2Decmp.java
@@ -4,7 +4,6 @@ package compressors;
  * Pokemon Gen 2 sprite decompressor Source:
  * https://github.com/pret/pokemon-reverse-engineering-tools/blob/master/pokemontools/lz.py 
  * (and gfx.py for flatten())
- * Ported to Java by sneed
  *
  */
 public class Gen2Decmp {
diff --git a/src/cuecompressors/BLZCoder.java b/src/cuecompressors/BLZCoder.java
index 2e6a8c6..3474fda 100755
--- a/src/cuecompressors/BLZCoder.java
+++ b/src/cuecompressors/BLZCoder.java
@@ -6,7 +6,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 /*----------------------------------------------------------------------------*/
 /*--  BLZCoder.java - Bottom LZ coding for Nintendo GBA/DS/3DS              --*/
@@ -14,7 +14,6 @@ import com.sneed.pkrandom.FileFunctions;
 /*--  Contains code based on "pk3DS", copyright (C) Kaphotics               --*/
 /*--  Contains code based on "pokemon-x-y-icons", copyright (C) CatTrinket  --*/
 /*--  Contains code based on "blz.c", copyright (C) 2011 CUE                --*/
-/*--  Above-listed code ported to Java by sneed and UPR-ZX team under   --*/
 /*--  the terms of the GPL:                                                 --*/
 /*--                                                                        --*/
 /*--  This program is free software: you can redistribute it and/or modify  --*/
diff --git a/src/pptxt/N3DSTxtHandler.java b/src/pptxt/N3DSTxtHandler.java
index 440a884..af76433 100644
--- a/src/pptxt/N3DSTxtHandler.java
+++ b/src/pptxt/N3DSTxtHandler.java
@@ -20,8 +20,8 @@ package pptxt;
 /*--  along with this program. If not, see <http://www.gnu.org/licenses/>.  --*/
 /*----------------------------------------------------------------------------*/
 
-import com.sneed.pkrandom.constants.Gen7Constants;
-import com.sneed.pkrandom.constants.N3DSConstants;
+import com.pkrandom.constants.Gen7Constants;
+import com.pkrandom.constants.N3DSConstants;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/pptxt/PPTxtHandler.java b/src/pptxt/PPTxtHandler.java
index 4a16842..eafd46c 100755
--- a/src/pptxt/PPTxtHandler.java
+++ b/src/pptxt/PPTxtHandler.java
@@ -3,7 +3,6 @@ package pptxt;
 /*----------------------------------------------------------------------------*/
 /*--  PPTxtHandler.java - handles generation 5 games text encoding          --*/
 /*--  Code derived from "PPTXT", copyright (C) SCV?                         --*/
-/*--  Ported to Java and bugfixed/customized by sneed                   --*/
 /*----------------------------------------------------------------------------*/
 
 import java.io.FileNotFoundException;
@@ -15,7 +14,7 @@ import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 public class PPTxtHandler {
 
diff --git a/src/thenewpoketext/PokeTextData.java b/src/thenewpoketext/PokeTextData.java
index 35f4721..ddea90d 100755
--- a/src/thenewpoketext/PokeTextData.java
+++ b/src/thenewpoketext/PokeTextData.java
@@ -3,7 +3,6 @@ package thenewpoketext;
 /*----------------------------------------------------------------------------*/
 /*--  PokeTextData.java - decodes gen4 games text into Unicode              --*/
 /*--  Code derived from "thenewpoketext", copyright (C) loadingNOW          --*/
-/*--  Ported to Java and bugfixed/customized by sneed                   --*/
 /*----------------------------------------------------------------------------*/
 
 import java.util.ArrayList;
diff --git a/src/thenewpoketext/TextToPoke.java b/src/thenewpoketext/TextToPoke.java
index f80fee4..e68147b 100755
--- a/src/thenewpoketext/TextToPoke.java
+++ b/src/thenewpoketext/TextToPoke.java
@@ -3,7 +3,6 @@ package thenewpoketext;
 /*----------------------------------------------------------------------------*/
 /*--  TextToPoke.java - encodes gen4 games text from Unicode                --*/
 /*--  Code derived from "thenewpoketext", copyright (C) loadingNOW          --*/
-/*--  Ported to Java and bugfixed/customized by sneed                   --*/
 /*----------------------------------------------------------------------------*/
 
 import java.util.ArrayList;
diff --git a/src/thenewpoketext/UnicodeParser.java b/src/thenewpoketext/UnicodeParser.java
index 6083b7e..5a209b0 100755
--- a/src/thenewpoketext/UnicodeParser.java
+++ b/src/thenewpoketext/UnicodeParser.java
@@ -3,7 +3,6 @@ package thenewpoketext;
 /*----------------------------------------------------------------------------*/
 /*--  UnicodeParser.java - maintains the poke<->unicode text table          --*/
 /*--  Code loosely derived from "thenewpoketext", copyright (C) loadingNOW  --*/
-/*--  Ported to Java and customized by sneed                            --*/
 /*----------------------------------------------------------------------------*/
 
 import java.io.FileNotFoundException;
@@ -11,7 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
 
-import com.sneed.pkrandom.FileFunctions;
+import com.pkrandom.FileFunctions;
 
 public class UnicodeParser {